From 28d40aea274aef54e30088a6a3b0bc711d4eb07b Mon Sep 17 00:00:00 2001 From: Lionel Hercot Date: Thu, 18 Jan 2024 13:40:41 -0800 Subject: [PATCH] [ignore] Force Ansible v2.14+ and update pipeline versions --- .github/workflows/ansible-test.yml | 21 ++++++++----------- .github/workflows/galaxy-importer.cfg | 2 +- README.md | 2 +- meta/runtime.yml | 2 +- .../modules/mso_schema_site_external_epg.py | 1 + ...mso_schema_template_external_epg_subnet.py | 2 ++ 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index 8e7f0abc..0696792f 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -7,7 +7,7 @@ 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 @@ -15,7 +15,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: Check out code uses: actions/checkout@v3 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/galaxy-importer.cfg b/.github/workflows/galaxy-importer.cfg index 631359cf..7208e7c1 100644 --- a/.github/workflows/galaxy-importer.cfg +++ b/.github/workflows/galaxy-importer.cfg @@ -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 diff --git a/README.md b/README.md index 99ce9b53..f6d08f6f 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/meta/runtime.yml b/meta/runtime.yml index 9aeca0a4..fa2d7635 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -1,5 +1,5 @@ --- -requires_ansible: '>=2.9.10' +requires_ansible: '>=2.14.0' plugin_routing: modules: mso_schema_template_externalepg: diff --git a/plugins/modules/mso_schema_site_external_epg.py b/plugins/modules/mso_schema_site_external_epg.py index 704cb5be..ee48df37 100644 --- a/plugins/modules/mso_schema_site_external_epg.py +++ b/plugins/modules/mso_schema_site_external_epg.py @@ -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. diff --git a/plugins/modules/mso_schema_template_external_epg_subnet.py b/plugins/modules/mso_schema_template_external_epg_subnet.py index f99fbe05..7339312a 100644 --- a/plugins/modules/mso_schema_template_external_epg_subnet.py +++ b/plugins/modules/mso_schema_template_external_epg_subnet.py @@ -50,6 +50,7 @@ - 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. @@ -57,6 +58,7 @@ - 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.