Skip to content

Commit

Permalink
[ignore] Force Ansible v2.14+ and update pipeline versions
Browse files Browse the repository at this point in the history
  • Loading branch information
lhercot committed Jan 19, 2024
1 parent 22a3595 commit 28d40ae
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
21 changes: 9 additions & 12 deletions .github/workflows/ansible-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ on:
# * is a special character in YAML so you have to quote this string
- cron: '0 7 * * *'
env:
python_version: 3.9
python_version: '3.10'
jobs:
build:
name: Build collection
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
ansible: [v2.9.27, v2.10.17, v2.11.12, v2.12.10, stable-2.13, stable-2.14]
ansible: [v2.14.13, v2.15.8, v2.16.2, stable-2.16]
steps:
- name: Check out code
uses: actions/checkout@v3
Expand Down Expand Up @@ -65,8 +65,8 @@ jobs:
with:
python-version: ${{ env.python_version }}

- name: Install ansible-base (stable-2.14)
run: pip install https://github.com/ansible/ansible/archive/stable-2.14.tar.gz --disable-pip-version-check
- name: Install ansible-base (v2.15.8)
run: pip install https://github.com/ansible/ansible/archive/v2.15.8.tar.gz --disable-pip-version-check

- name: Download migrated collection artifacts
uses: actions/download-artifact@v3
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ansible: [v2.9.27, v2.10.17, v2.11.12, v2.12.10, stable-2.13, stable-2.14]
ansible: [v2.14.13, v2.15.8, v2.16.2, stable-2.16]
steps:
- name: Set up Python ${{ env.python_version }}
uses: actions/setup-python@v4
Expand Down Expand Up @@ -152,11 +152,8 @@ jobs:
strategy:
fail-fast: false
matrix:
ansible: [v2.10.17, v2.11.12, v2.12.10, stable-2.13, stable-2.14]
python-version: [3.9]
include:
- ansible: v2.9.27
python-version: 3.8
ansible: [v2.14.13, v2.15.8, v2.16.2, stable-2.16]
python-version: ['3.10']
steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
Expand Down Expand Up @@ -201,8 +198,8 @@ jobs:
with:
python-version: ${{ env.python_version }}

- name: Install ansible-base (stable-2.13)
run: pip install https://github.com/ansible/ansible/archive/stable-2.13.tar.gz --disable-pip-version-check
- name: Install ansible-base (v2.15.8)
run: pip install https://github.com/ansible/ansible/archive/v2.15.8.tar.gz --disable-pip-version-check

- name: Install coverage (v4.5.4)
run: pip install coverage==4.5.4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/galaxy-importer.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[galaxy-importer]
LOG_LEVEL_MAIN = INFO
RUN_FLAKE8 = True
RUN_FLAKE8 = False
RUN_ANSIBLE_DOC = True
RUN_ANSIBLE_LINT = True
RUN_ANSIBLE_TEST = False
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Modules supporting new features introduced in MSO API in specific MSO versions m
*Note: The Nexus Dashboard (ND) HTTPAPI connection plugin should be used when Cisco ACI Multi-Site is installed on Nexus Dashboard (v3.2+) or when using this collection with Nexus Dashboard Orchestrator (v3.6+).*

## Requirements
- Ansible v2.9 or newer
- Ansible v2.14 or newer

## Install
Ansible must be installed
Expand Down
2 changes: 1 addition & 1 deletion meta/runtime.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
requires_ansible: '>=2.9.10'
requires_ansible: '>=2.14.0'
plugin_routing:
modules:
mso_schema_template_externalepg:
Expand Down
1 change: 1 addition & 0 deletions plugins/modules/mso_schema_site_external_epg.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
- In NDO versions over 4.2, the parameter is accessible only when an external EPG is
- linked to the current schema-template's VRF.
type: str
aliases: [ l3out_name ]
l3out_schema:
description:
- The schema that defines the referenced L3Out.
Expand Down
2 changes: 2 additions & 0 deletions plugins/modules/mso_schema_template_external_epg_subnet.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,15 @@
- The C(shared-security) for Shared Security Import can only be used when External Subnets for External EPG is present
type: list
elements: str
default: []
aggregate:
description:
- The aggregate option aggregates shared routes for the subnet.
- Use C(shared-rtctrl) to add Aggregate Shared Routes
- The C(shared-rtctrl) option can only be used when scope parameter Shared Route Control in the Route Control section is selected.
type: list
elements: str
default: []
state:
description:
- Use C(present) or C(absent) for adding or removing.
Expand Down

0 comments on commit 28d40ae

Please sign in to comment.