Release 2.3.1 version

Change-Id: I8fa2c36d08e387c93f61630b55892ff69b4eff6a

.zuul.yaml

@@ -164,17 +164,17 @@
       tox_install_siblings: false
 
 - job:
-    name: ansible-collections-openstack-functional-devstack-ansible-2.12
+    name: ansible-collections-openstack-functional-devstack-ansible-2.18
     parent: ansible-collections-openstack-functional-devstack-base
     branches: master
     description: |
       Run openstack collections functional tests against a master devstack
-      using master of openstacksdk and stable 2.12 branch of ansible
+      using master of openstacksdk and stable 2.16 branch of ansible
     required-projects:
       - name: github.com/ansible/ansible
-        override-checkout: stable-2.12
+        override-checkout: stable-2.18
     vars:
-      tox_envlist: ansible_2_12
+      tox_envlist: ansible_2_18
 
 - job:
     name: ansible-collections-openstack-functional-devstack-ansible-devel
@@ -218,19 +218,17 @@
       bindep_profile: test py310
 
 - job:
-    name: openstack-tox-linters-ansible-2.12
+    name: openstack-tox-linters-ansible-2.18
     parent: openstack-tox-linters-ansible
-    nodeset: ubuntu-focal
     description: |
-      Run openstack collections linter tests using the 2.12 branch of ansible
+      Run openstack collections linter tests using the 2.18 branch of ansible
     required-projects:
       - name: github.com/ansible/ansible
-        override-checkout: stable-2.12
+        override-checkout: stable-2.18
     vars:
-      ensure_tox_version: '<4'
-      tox_envlist: linters_2_12
-      python_version: 3.8
-      bindep_profile: test py38
+      tox_envlist: linters_2_18
+      python_version: "3.12"
+      bindep_profile: test py312
 
 # Cross-checks with other projects
 - job:
@@ -268,26 +266,26 @@
     data:
       url: https://galaxy.ansible.com
       token: !encrypted/pkcs1-oaep
-        - lZFzfoCbuwqV1k6qRfl/VS7E+knUW7+zpg7BptrenK4n0g7UY0HtdVkYq0pV0Tj/LbhzG
-          jHD0mehcV1iS6B7ORKg4criJkdDfEx09BD8z8yv0EleiIMmhlrCoMcY593OZMBtVbGi0D
-          CwQtNO98QIsfZogChfLfvRNiBmUV98mEb/p6p3EtGx8J7qcAsqfWxc/CzB8GCleLAHHHT
-          FuikMM03ZnV0ew7E+TPkHbzzPhBZOqS5HYF0HtgttHwIXdfIWp/XdTuEEk7uRRgYZ2Iao
-          ifWRzoKaOQmhM++e1ydCqw9D4y9dZEFNMQLwSqcrvtb8cNwT1kl7SCFqYNE2lbutj4ne6
-          PTBQRsKegMB4Y3ena14fNF6tCynvJLPhF/cjPH2Jhs+B19XQhWkL3TgiOY02W24YHwRcP
-          +LdkM8inAvyVi3DEbEqdjBPO9OFJcBOKPlCdkGvuwdNCuEpEwctWs0gV3voflG2CDKzmJ
-          wu9JJOAWnq/0l1WpuDqWreKeQ/BUGZC2Gb4xRAqofulgvhs4WuYoEccjH4EJFIZ90S1EP
-          R/ZLadqZaEhmjwGM5sMWbBbjT23XsRgg0Tzt9m8DENYMuYDqkMdRbt2jYZa+32p4hyxVe
-          Y6H/pqYq5b9uOzumnShaK4WlmkQyXcNPkoSlMC1h4OGvqX/WUixpI38jyMA5Tc=
+        - QJ3c5LfmM4YmqwwLKv4wK5lroWDLGeMyPkmHXhvf0ry3vGjKZvZxVpbIhFXJHXevHov/r
+          nvlqwmG8D5msynQKZDFg2ZwSMIQWRKfSbsSLe7A6NWI2wC+QtZSPiRiBcBcHY1QbNNW21
+          84cssYa1oHOA0WXpomBz1qXuPV48aKLjMnWysgFhNSx3Oog+ZOSCczyyVVuXP1lIWIO26
+          AtRTrEcr37K3JY9usE2PCbZKFOq/+IDPz9fbS7PtBOv7iXOHOf3AfBiJiaJe3q/ecoaaq
+          ejk2WTKWfvq/3rY4pU1976kUcxgcd+jj9ReFyw8edCsc1ecL0qmZFbdHmC03jEcVo4p8I
+          WJQ0D5wk4/u2Fu9texNuBvb62Yu3Y028Zhm5rz8Zl/ISsdaA3losn5S7C7iAH/yKlGQEI
+          N/1X4M0tVPaMtsIhZyyz+JMbeNyVR9ZarqbtpzRtVhjxL7KOiAQbEzAmZcBbCJ2Z5iI+P
+          bTp03f9Y/tZNtkohARvx1TKhv8CvsmyGkMm+r5Y8aWz3SNy8LL6bSwtGun/ifbnadHmw/
+          TD5/UUXHHjBGkeAu9HTtwUZ5Qdkfg92PnPgruAAuOkF1Y4RyRS9qvwhtqyHO8TwU0INRY
+          5MHEzeOQWemoQb/qdENp+J/Q9oMEbpFYv9TkrWkxVoKop6Str8e3FF5sxmN/SE=
 
 - project:
     check:
       jobs:
         - tox-pep8
         - openstack-tox-linters-ansible-devel
-        - openstack-tox-linters-ansible-2.12
+        - openstack-tox-linters-ansible-2.18
         - ansible-collections-openstack-functional-devstack
         - ansible-collections-openstack-functional-devstack-releases
-        - ansible-collections-openstack-functional-devstack-ansible-2.12
+        - ansible-collections-openstack-functional-devstack-ansible-2.18
         - ansible-collections-openstack-functional-devstack-ansible-devel
         - ansible-collections-openstack-functional-devstack-magnum
         - ansible-collections-openstack-functional-devstack-octavia
@@ -302,20 +300,18 @@
     gate:
       jobs:
         - tox-pep8
-        - openstack-tox-linters-ansible-2.12
-        # - ansible-collections-openstack-functional-devstack
+        - openstack-tox-linters-ansible-2.18
         - ansible-collections-openstack-functional-devstack-releases
-        # - ansible-collections-openstack-functional-devstack-ansible-2.12
         - ansible-collections-openstack-functional-devstack-magnum
         - ansible-collections-openstack-functional-devstack-octavia
 
     periodic:
       jobs:
         - openstack-tox-linters-ansible-devel
-        - openstack-tox-linters-ansible-2.12
+        - openstack-tox-linters-ansible-2.18
         - ansible-collections-openstack-functional-devstack
         - ansible-collections-openstack-functional-devstack-releases
-        - ansible-collections-openstack-functional-devstack-ansible-2.12
+        - ansible-collections-openstack-functional-devstack-ansible-2.18
         - ansible-collections-openstack-functional-devstack-ansible-devel
         - bifrost-collections-src
         - bifrost-keystone-collections-src

CHANGELOG.rst

@@ -5,6 +5,19 @@ Ansible OpenStack Collection Release Notes
 .. contents:: Topics
 
 
+v2.3.1
+======
+
+Release Summary
+---------------
+
+Client TLS certificate support
+
+Minor Changes
+-------------
+
+- Add ability to pass client tls certificate
+
 v2.3.0
 ======
 

changelogs/changelog.yaml

@@ -572,3 +572,9 @@ releases:
       name: volume_service_info
       namespace: ''
     release_date: '2024-11-28'
+  2.3.1:
+    changes:
+      minor_changes:
+      - Add ability to pass client tls certificate
+      release_summary: Client TLS certificate support
+    release_date: '2024-12-18'

changelogs/fragments/coe_cluster_template_labels_comparison.yml

@@ -1,7 +0,0 @@
----
-
-bugfixes:
-  - |
-    coe_cluster_template - now labels are converted to strings by module that
-    fixes module idempotence in case label values defined by users are
-    integers or booleans.

changelogs/fragments/image_deactivate_reactivate.yml

@@ -1,7 +0,0 @@
----
-
-minor_changes:
-  - |
-    openstack.cloud.image - Added new `inactive` option for the image  `state`
-    It will deactivate the image. Setting state `present` can re-activate it
-    again for deactivated previously images.

ci/roles/server_action/tasks/main.yml

@@ -460,20 +460,14 @@
   register: server
   ignore_errors: true
 
-- name: Assert shelve offload server
-  assert:
-    that:
-      - ((server is success)
-         or (server is not success
-             and "Cannot 'shelveOffload' instance" in server.msg
-             and ("while it is in vm_state shelved_offloaded" in server.msg
-             or "while it is in task_state shelving_offloading" in server.msg )))
-
 - name: Get info about server
   openstack.cloud.server_info:
     cloud: "{{ cloud }}"
     server: ansible_server
   register: servers
+  until: servers.servers.0.task_state == none
+  retries: 30
+  delay: 10
 
 - name: Ensure status for server is SHELVED_OFFLOADED
   # no change if server has been offloaded automatically after first shelve command

galaxy.yml

@@ -32,4 +32,4 @@ build_ignore:
   - .vscode
   - ansible_collections_openstack.egg-info
   - changelogs
-version: 2.3.0
+version: 2.3.1

plugins/module_utils/openstack.py

@@ -183,7 +183,7 @@ def openstack_cloud_from_module(module, min_version=None, max_version=None):
                 " excluded.")
             for param in (
                     'auth', 'region_name', 'validate_certs',
-                    'ca_cert', 'client_key', 'api_timeout', 'auth_type'):
+                    'ca_cert', 'client_cert', 'client_key', 'api_timeout', 'auth_type'):
                 if module.params[param] is not None:
                     module.fail_json(msg=fail_message.format(param=param))
             # For 'interface' parameter, fail if we receive a non-default value
@@ -199,6 +199,7 @@ def openstack_cloud_from_module(module, min_version=None, max_version=None):
                 verify=module.params['validate_certs'],
                 cacert=module.params['ca_cert'],
                 key=module.params['client_key'],
+                cert=module.params['client_cert'],
                 api_timeout=module.params['api_timeout'],
                 interface=module.params['interface'],
             )
@@ -358,7 +359,7 @@ class OpenStackModule:
                 " excluded.")
             for param in (
                     'auth', 'region_name', 'validate_certs',
-                    'ca_cert', 'client_key', 'api_timeout', 'auth_type'):
+                    'ca_cert', 'client_cert', 'client_key', 'api_timeout', 'auth_type'):
                 if self.params[param] is not None:
                     self.fail_json(msg=fail_message.format(param=param))
             # For 'interface' parameter, fail if we receive a non-default value

setup.py

@@ -4,6 +4,6 @@
 import setuptools
 
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr', 'setuptools'],
     pbr=True,
     py_modules=[])

tests/requirements-ansible-2.16.txt

@@ -0,0 +1,12 @@
+ansible-core>=2.16.0,<2.17.0
+flake8
+galaxy-importer
+openstacksdk
+pycodestyle
+pylint
+rstcheck
+ruamel.yaml
+tox
+voluptuous
+yamllint
+setuptools

tests/requirements-ansible-2.18.txt

@@ -0,0 +1,12 @@
+ansible-core>=2.18.0,<2.19.0
+flake8
+galaxy-importer
+openstacksdk
+pycodestyle
+pylint
+rstcheck
+ruamel.yaml
+tox
+voluptuous
+yamllint
+setuptools

tox.ini

@@ -36,13 +36,14 @@ deps =
     galaxy-importer
     pbr
     ruamel.yaml
+    setuptools
 commands =
     python {toxinidir}/tools/build.py
     ansible --version
     ansible-galaxy collection build --force {toxinidir} --output-path {toxinidir}/build_artifact
     bash {toxinidir}/tools/check-import.sh {toxinidir}
 
-[testenv:linters_{2_9,2_11,2_12,latest}]
+[testenv:linters_{2_9,2_11,2_12,2_16,2_18,latest}]
 allowlist_externals = bash
 commands =
     {[testenv:build]commands}
@@ -56,6 +57,8 @@ deps =
     linters_2_9:    -r{toxinidir}/tests/requirements-ansible-2.9.txt
     linters_2_11:   -r{toxinidir}/tests/requirements-ansible-2.11.txt
     linters_2_12:   -r{toxinidir}/tests/requirements-ansible-2.12.txt
+    linters_2_16:   -r{toxinidir}/tests/requirements-ansible-2.16.txt
+    linters_2_16:   -r{toxinidir}/tests/requirements-ansible-2.18.txt
 passenv = *
 
 [flake8]
@@ -69,7 +72,7 @@ ignore = W503,H4,E501,E402,H301
 show-source = True
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,ansible_collections
 
-[testenv:ansible_{2_9,2_11,2_12,latest}]
+[testenv:ansible_{2_9,2_11,2_12,2_16,2_18,latest}]
 allowlist_externals = bash
 commands =
     bash {toxinidir}/ci/run-ansible-tests-collection.sh -e {envdir} {posargs}
@@ -79,6 +82,8 @@ deps =
     ansible_2_9:    -r{toxinidir}/tests/requirements-ansible-2.9.txt
     ansible_2_11:   -r{toxinidir}/tests/requirements-ansible-2.11.txt
     ansible_2_12:   -r{toxinidir}/tests/requirements-ansible-2.12.txt
+    ansible_2_16:   -r{toxinidir}/tests/requirements-ansible-2.16.txt
+    ansible_2_18:   -r{toxinidir}/tests/requirements-ansible-2.18.txt
 # Need to pass some env vars for the Ansible playbooks
 passenv =
     HOME