Release 1.7.0 version

Change-Id: Ic09e1bb4b072c79de8af6036afae5f99f63042c0

.gitignore

@@ -1,7 +1,6 @@
 .tox
 build_artifact
 ansible_collections
-galaxy.yml
 FILES.json
 MANIFEST.json
 importer_result.json

.zuul.yaml

@@ -3,16 +3,76 @@
 - job:
     name: ansible-collections-openstack-functional-devstack
     parent: openstacksdk-functional-devstack
+    post-run: ci/playbooks/postlog.yaml
     description: |
       Run openstack collections functional tests against a master devstack
       using master of openstacksdk with latest ansible release
     required-projects:
       - openstack/ansible-collections-openstack
+      - openstack/designate
+    irrelevant-files: &ignore_files
+      - changelogs/.*
+      - galaxy.*
+      - COPYING
+      - docs/.*
+      - .*\.md
+      - .*\.rst
+      - tools/run-ansible-sanity.sh
+      - tests/sanity/.*
+      - contrib/.*
+      - .zuul.yaml
     vars:
       zuul_work_dir: src/opendev.org/openstack/ansible-collections-openstack
       tox_envlist: ansible
-      tox_install_siblings: true
+      tox_install_siblings: false
       fetch_subunit: false
+      devstack_plugins:
+        designate: https://opendev.org/openstack/designate
+      devstack_services:
+        designate: true
+        neutron-dns: true
+      zuul_copy_output:
+        '{{ devstack_log_dir }}/test_output.log': 'logs'
+      extensions_to_txt:
+        log: true
+
+- job:
+    name: ansible-collections-openstack-functional-devstack-octavia
+    parent: ansible-collections-openstack-functional-devstack
+    description: |
+      Run openstack collections functional tests against a master devstack
+      with Octavia plugin enabled, using releases of openstacksdk and latest
+      ansible release. Run it only on Load Balancer changes.
+    pre-run: ci/playbooks/get_amphora_tarball.yaml
+    required-projects:
+      - openstack/octavia
+      - name: github.com/ansible/ansible
+        override-checkout: stable-2.12
+    files:
+      - ^ci/roles/loadbalancer/.*$
+      - ^plugins/modules/lb_health_monitor.py
+      - ^plugins/modules/lb_listener.py
+      - ^plugins/modules/lb_member.py
+      - ^plugins/modules/lb_pool.py
+      - ^plugins/modules/loadbalancer.py
+    vars:
+      configure_swap_size: 8192
+      tox_envlist: ansible
+      devstack_plugins:
+        designate: https://opendev.org/openstack/designate
+        octavia: https://opendev.org/openstack/octavia
+      devstack_services:
+        designate: true
+        neutron-dns: true
+        octavia: true
+        o-api: true
+        o-cw: true
+        o-hk: true
+        o-hm: true
+      devstack_localrc:
+        OCTAVIA_AMP_IMAGE_FILE: "/tmp/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2"
+        OCTAVIA_AMP_IMAGE_SIZE: 3
+        OCTAVIA_AMP_IMAGE_NAME: "test-only-amphora-x64-haproxy-ubuntu-bionic"
 
 - job:
     name: ansible-collections-openstack-functional-devstack-releases
@@ -21,142 +81,175 @@
       Run openstack collections functional tests against a master devstack
       using releases of openstacksdk and latest ansible release
     vars:
+      tox_envlist: ansible
       tox_install_siblings: false
 
+# Job with Ansible 2.9 for checking backward compatibility
+- job:
+    name: ansible-collections-openstack-functional-devstack-ansible-2.9
+    parent: ansible-collections-openstack-functional-devstack
+    description: |
+      Run openstack collections functional tests against a master devstack
+      using master of openstacksdk and stable 2.9 branch of ansible
+    required-projects:
+      - name: github.com/ansible/ansible
+        override-checkout: stable-2.9
+    vars:
+      tox_envlist: ansible-2.9
+
+- job:
+    name: ansible-collections-openstack-functional-devstack-ansible-2.11
+    parent: ansible-collections-openstack-functional-devstack
+    description: |
+      Run openstack collections functional tests against a master devstack
+      using master of openstacksdk and stable 2.12 branch of ansible
+    required-projects:
+      - name: github.com/ansible/ansible
+        override-checkout: stable-2.11
+    vars:
+      tox_envlist: ansible
+
+- job:
+    name: ansible-collections-openstack-functional-devstack-ansible-2.12
+    parent: ansible-collections-openstack-functional-devstack
+    description: |
+      Run openstack collections functional tests against a master devstack
+      using master of openstacksdk and stable 2.12 branch of ansible
+    required-projects:
+      - name: github.com/ansible/ansible
+        override-checkout: stable-2.12
+    vars:
+      tox_envlist: ansible
+
+- job:
+    name: ansible-collections-openstack-functional-devstack-ansible-new_sdk
+    parent: ansible-collections-openstack-functional-devstack-ansible-2.12
+    voting: false
+    vars:
+      tox_install_siblings: true
+
 - job:
     name: ansible-collections-openstack-functional-devstack-ansible-devel
     parent: ansible-collections-openstack-functional-devstack
     description: |
       Run openstack collections functional tests against a master devstack
       using master of openstacksdk and devel branch of ansible
-    # non-voting because we can't prevent ansible devel from breaking us
     voting: false
     required-projects:
       - name: github.com/ansible/ansible
         override-checkout: devel
+    vars:
+      tox_envlist: ansible-2.12
+
+# Stable branches tests
 
 - job:
-    name: ansible-collections-openstack-functional-devstack-ansible-2.9
+    name: ansible-collections-openstack-functional-devstack-xena-ansible-2.12
     parent: ansible-collections-openstack-functional-devstack-ansible-devel
     description: |
-      Run openstack collections functional tests against a master devstack
+      Run openstack collections functional tests against a xena devstack
-      using master of openstacksdk and stable 2.9 branch of ansible
+      using xena brach of openstacksdk and stable 2.12 branch of ansible
     voting: true
+    override-checkout: stable/xena
     required-projects:
       - name: github.com/ansible/ansible
-        override-checkout: stable-2.9
+        override-checkout: stable-2.12
-
-- job:
-    name: ansible-collections-openstack-functional-devstack-train-ansible-devel
-    parent: ansible-collections-openstack-functional-devstack
-    description: |
-      Run openstack collections functional tests against a train devstack
-      using train brach of openstacksdk and devel branch of ansible
-    # non-voting because we can't prevent ansible devel from breaking us
-    voting: false
-    required-projects:
-      - name: github.com/ansible/ansible
-        override-checkout: devel
       - name: openstack/openstacksdk
-        override-branch: train
+        override-checkout: stable/xena
-      - name: openstack/devstack
+    vars:
-        override-checkout: train
+      tox_envlist: ansible
 
 - job:
-    name: ansible-collections-openstack-functional-devstack-train-ansible-2.9
+    name: ansible-collections-openstack-functional-devstack-wallaby-ansible-2.12
+    parent: ansible-collections-openstack-functional-devstack-ansible-devel
+    description: |
+      Run openstack collections functional tests against a wallaby devstack
+      using wallaby brach of openstacksdk and stable 2.12 branch of ansible
+    voting: true
+    override-checkout: stable/wallaby
+    required-projects:
+      - name: github.com/ansible/ansible
+        override-checkout: stable-2.12
+      - name: openstack/openstacksdk
+        override-checkout: stable/wallaby
+    vars:
+      tox_envlist: ansible
+
+- job:
+    name: ansible-collections-openstack-functional-devstack-victoria-ansible-2.12
+    parent: ansible-collections-openstack-functional-devstack-ansible-devel
+    description: |
+      Run openstack collections functional tests against a victoria devstack
+      using victoria brach of openstacksdk and stable 2.12 branch of ansible
+    voting: true
+    override-checkout: stable/victoria
+    required-projects:
+      - name: github.com/ansible/ansible
+        override-checkout: stable-2.12
+      - name: openstack/openstacksdk
+        override-checkout: stable/victoria
+    vars:
+      tox_envlist: ansible
+
+
+- job:
+    name: ansible-collections-openstack-functional-devstack-ussuri-ansible-2.11
+    parent: ansible-collections-openstack-functional-devstack-ansible-devel
+    description: |
+      Run openstack collections functional tests against a ussuri devstack
+      using ussuri brach of openstacksdk and stable 2.11 branch of ansible
+    voting: true
+    override-checkout: stable/ussuri
+    required-projects:
+      - name: github.com/ansible/ansible
+        override-checkout: stable-2.11
+      - name: openstack/openstacksdk
+        override-checkout: stable/ussuri
+      - name: openstack/os-client-config
+        override-checkout: stable/ussuri
+    vars:
+      tox_envlist: ansible
+
+- job:
+    name: ansible-collections-openstack-functional-devstack-train-ansible-2.11
     parent: ansible-collections-openstack-functional-devstack-ansible-devel
     description: |
       Run openstack collections functional tests against a train devstack
-      using train brach of openstacksdk and stable 2.9 branch of ansible
+      using train brach of openstacksdk and stable 2.11 branch of ansible
     voting: true
+    override-checkout: stable/train
     required-projects:
       - name: github.com/ansible/ansible
-        override-checkout: stable-2.9
+        override-checkout: stable-2.11
       - name: openstack/openstacksdk
-        override-branch: train
+        override-checkout: stable/train
-      - name: openstack/devstack
+      - name: openstack/os-client-config
-        override-checkout: train
+        override-checkout: stable/train
+    vars:
+      tox_envlist: ansible
 
 - job:
-    name: ansible-collections-openstack-functional-devstack-stein-ansible-devel
+    name: ansible-collections-openstack-functional-devstack-queens-ansible-2.11
-    parent: ansible-collections-openstack-functional-devstack
-    description: |
-      Run openstack collections functional tests against a stein devstack
-      using stein brach of openstacksdk and devel branch of ansible
-    # non-voting because we can't prevent ansible devel from breaking us
-    voting: false
-    required-projects:
-      - name: github.com/ansible/ansible
-        override-checkout: devel
-      - name: openstack/openstacksdk
-        override-branch: stein
-      - name: openstack/devstack
-        override-checkout: stein
-
-- job:
-    name: ansible-collections-openstack-functional-devstack-stein-ansible-2.9
-    parent: ansible-collections-openstack-functional-devstack-ansible-devel
-    description: |
-      Run openstack collections functional tests against a stein devstack
-      using stein brach of openstacksdk and stable 2.9 branch of ansible
-    voting: true
-    required-projects:
-      - name: github.com/ansible/ansible
-        override-checkout: stable-2.9
-      - name: openstack/openstacksdk
-        override-branch: stein
-      - name: openstack/devstack
-        override-checkout: stein
-
-- job:
-    name: ansible-collections-openstack-functional-devstack-rocky-ansible-devel
-    parent: ansible-collections-openstack-functional-devstack
-    description: |
-      Run openstack collections functional tests against a rocky devstack
-      using rocky brach of openstacksdk and devel branch of ansible
-    # non-voting because we can't prevent ansible devel from breaking us
-    voting: false
-    required-projects:
-      - name: github.com/ansible/ansible
-        override-checkout: devel
-      - name: openstack/openstacksdk
-        override-branch: rocky
-      - name: openstack/devstack
-        override-checkout: rocky
-
-- job:
-    name: ansible-collections-openstack-functional-devstack-rocky-ansible-2.9
-    parent: ansible-collections-openstack-functional-devstack-ansible-devel
-    description: |
-      Run openstack collections functional tests against a rocky devstack
-      using rocky brach of openstacksdk and stable 2.9 branch of ansible
-    voting: true
-    required-projects:
-      - name: github.com/ansible/ansible
-        override-checkout: stable-2.9
-      - name: openstack/openstacksdk
-        override-branch: rocky
-      - name: openstack/devstack
-        override-checkout: rocky
-
-- job:
-    name: ansible-collections-openstack-functional-devstack-queens-ansible-2.9
     parent: ansible-collections-openstack-functional-devstack-ansible-devel
     description: |
       Run openstack collections functional tests against a queens devstack
-      using master brach of openstacksdk and stable 2.9 branch of ansible
+      using master branch of openstacksdk and stable 2.11 branch of ansible
     voting: true
+    override-checkout: stable/queens
     required-projects:
       - name: github.com/ansible/ansible
-        override-checkout: stable-2.9
+        override-checkout: stable-2.11
       - name: openstack/openstacksdk
-        override-branch: master
+        # Run queens with highest possible py2 version of SDK
-      - name: openstack/devstack
+        override-checkout: stable/train
-        override-checkout: queens
+    vars:
+      tox_envlist: ansible
 
+# Linters
 - job:
     name: openstack-tox-linters-ansible-devel
     parent: openstack-tox-linters
+    nodeset: ubuntu-focal
     description: |
       Run openstack collections linter tests using the devel branch of ansible
     # non-voting because we can't prevent ansible devel from breaking us
@@ -164,76 +257,246 @@
     required-projects:
       - name: github.com/ansible/ansible
         override-checkout: devel
+    vars:
+      tox_envlist: linters-2.12
+      python_version: 3.8
+      bindep_profile: test py38
+
+- job:
+    name: openstack-tox-linters-ansible-2.12
+    parent: openstack-tox-linters
+    nodeset: ubuntu-focal
+    description: |
+      Run openstack collections linter tests using the 2.12 branch of ansible
+    voting: true
+    required-projects:
+      - name: github.com/ansible/ansible
+        override-checkout: stable-2.12
+    vars:
+      tox_envlist: linters-2.12
+      python_version: 3.8
+      bindep_profile: test py38
 
 - job:
     name: openstack-tox-linters-ansible-2.9
     parent: openstack-tox-linters
+    nodeset: ubuntu-bionic
     description: |
       Run openstack collections linter tests using the 2.9 branch of ansible
     voting: true
     required-projects:
       - name: github.com/ansible/ansible
         override-checkout: stable-2.9
+    vars:
+      tox_envlist: linters-2.9
+
+# Cross-checks with other projects
+- job:
+    name: bifrost-collections-src
+    parent: bifrost-integration-tinyipa-ubuntu-focal
+    required-projects:
+      - openstack/ansible-collections-openstack
+
+- job:
+    name: bifrost-keystone-collections-src
+    parent: bifrost-integration-tinyipa-keystone-ubuntu-focal
+    required-projects:
+      - openstack/ansible-collections-openstack
+
+# TripleO jobs
+- job:
+    name: tripleo-ci-centos-8-standalone-osa
+    parent: tripleo-ci-base-standalone-centos-8
+    vars:
+      featureset: '052'
+      consumer_job: false
+      build_container_images: true
+    irrelevant-files: &irr_files
+      - .*molecule.*
+      - ^.*\.md$
+      - ^.*\.rst$
+      - ^docs/.*$
+      - ^contrib/.*$
+      - ^changelogs/.*$
+      - ^meta/.*$
+      - ^tests/.*$
+      - ^tools/.*$
+      - ^requirements.*$
+      - ^test-requirements.*$
+      - ^setup.*$
+      - tox.ini
+    # Run only on files used in TripleO
+    files: &ooo_files
+      - ^plugins/modules/catalog_service.*$
+      - ^plugins/modules/endpoint.*$
+      - ^plugins/modules/identity_domain.*$
+      - ^plugins/modules/identity_domain_info.*$
+      - ^plugins/modules/identity_role.*$
+      - ^plugins/modules/identity_user.*$
+      - ^plugins/modules/keypair.*$
+      - ^plugins/modules/project.*$
+      - ^plugins/modules/role_assignment.*$
+      - ^plugins/modules/stack.*$
+      - ^plugins/module_utils/openstack.*$
+
+- job:
+    name: tripleo-ci-centos-9-standalone-osa
+    parent: tripleo-ci-centos-8-standalone-osa
+    nodeset: single-centos-9-node
+    branches: master
+    vars:
+      containers_base_image: quay.io/centos/centos:stream9
+      consumer_job: false
+      build_container_images: true
+    files: *ooo_files
+    irrelevant-files: *irr_files
+
+- job:
+    name: tripleo-ci-centos-8-standalone-train-osa
+    parent: tripleo-ci-centos-8-standalone-osa
+    override-checkout: stable/train
+    vars:
+      branch_override: stable/train
+
+- job:
+    name: tripleo-ci-centos-8-standalone-wallaby-osa
+    parent: tripleo-ci-centos-8-standalone-osa
+    override-checkout: stable/wallaby
+    vars:
+      branch_override: stable/wallaby
+
+- job:
+    name: tripleo-ci-centos-9-standalone-wallaby-osa
+    parent: tripleo-ci-centos-9-standalone-osa
+    branches: master
+    override-checkout: stable/wallaby
+    vars:
+      branch_override: stable/wallaby
+
+- job:
+    name: ansible-collections-openstack-release
+    parent: base
+    run: ci/publish/publish_collection.yml
+    secrets:
+      - ansible_galaxy_info
+
+- secret:
+    name: ansible_galaxy_info
+    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=
 
 - project:
     check:
       jobs:
         - tox-pep8
         - openstack-tox-linters-ansible-devel
+        - openstack-tox-linters-ansible-2.12
         - openstack-tox-linters-ansible-2.9
         - ansible-collections-openstack-functional-devstack:
             dependencies: &deps_unit_lint
               - tox-pep8
               - openstack-tox-linters-ansible-2.9
-            irrelevant-files: &ignore_files
+              - openstack-tox-linters-ansible-2.12
-              - changelogs/.*
-              - COPYING
-              - docs/.*
-              - README.md
-              - tools/run-ansible-sanity.sh
-              - tests/sanity/.*
 
+        - ansible-collections-openstack-functional-devstack-ansible-new_sdk:
+            dependencies: *deps_unit_lint
         - ansible-collections-openstack-functional-devstack-releases:
             dependencies: *deps_unit_lint
-            irrelevant-files: *ignore_files
-        - ansible-collections-openstack-functional-devstack-ansible-devel:
-            dependencies: *deps_unit_lint
-            irrelevant-files: *ignore_files
         - ansible-collections-openstack-functional-devstack-ansible-2.9:
             dependencies: *deps_unit_lint
-            irrelevant-files: *ignore_files
+        - ansible-collections-openstack-functional-devstack-ansible-2.12:
-        - ansible-collections-openstack-functional-devstack-train-ansible-devel:
+            dependencies: *deps_unit_lint
+        - ansible-collections-openstack-functional-devstack-ansible-devel:
+            dependencies: *deps_unit_lint
+        - ansible-collections-openstack-functional-devstack-xena-ansible-2.12:
+            dependencies: *deps_unit_lint
+        - ansible-collections-openstack-functional-devstack-wallaby-ansible-2.12:
+            dependencies: *deps_unit_lint
+        - ansible-collections-openstack-functional-devstack-train-ansible-2.11:
+            dependencies: *deps_unit_lint
+        - ansible-collections-openstack-functional-devstack-octavia:
+            dependencies: *deps_unit_lint
+
+        - bifrost-collections-src:
+            voting: false
             dependencies: *deps_unit_lint
             irrelevant-files: *ignore_files
-        - ansible-collections-openstack-functional-devstack-train-ansible-2.9:
+        - bifrost-keystone-collections-src:
-            dependencies: *deps_unit_lint
+            voting: false
-            irrelevant-files: *ignore_files
-        - ansible-collections-openstack-functional-devstack-stein-ansible-devel:
-            dependencies: *deps_unit_lint
-            irrelevant-files: *ignore_files
-        - ansible-collections-openstack-functional-devstack-stein-ansible-2.9:
-            dependencies: *deps_unit_lint
-            irrelevant-files: *ignore_files
-        - ansible-collections-openstack-functional-devstack-rocky-ansible-devel:
-            dependencies: *deps_unit_lint
-            irrelevant-files: *ignore_files
-        - ansible-collections-openstack-functional-devstack-rocky-ansible-2.9:
-            dependencies: *deps_unit_lint
-            irrelevant-files: *ignore_files
-        - ansible-collections-openstack-functional-devstack-queens-ansible-2.9:
             dependencies: *deps_unit_lint
             irrelevant-files: *ignore_files
 
+        - tripleo-ci-centos-8-standalone-wallaby-osa:
+            dependencies: *deps_unit_lint
+
+        - tripleo-ci-centos-8-standalone-train-osa:
+            voting: false
+            dependencies: *deps_unit_lint
+
+        - tripleo-ci-centos-9-standalone-osa:
+            voting: false
+            dependencies: *deps_unit_lint
+
+        - tripleo-ci-centos-9-standalone-wallaby-osa:
+            voting: false
+            dependencies: *deps_unit_lint
 
     gate:
       jobs:
         - tox-pep8
-        - openstack-tox-linters
+        - openstack-tox-linters-ansible-2.12
+        - openstack-tox-linters-ansible-2.9
         - ansible-collections-openstack-functional-devstack
         - ansible-collections-openstack-functional-devstack-releases
         - ansible-collections-openstack-functional-devstack-ansible-2.9
-        - ansible-collections-openstack-functional-devstack-train-ansible-2.9
+        - ansible-collections-openstack-functional-devstack-ansible-2.12
-        - ansible-collections-openstack-functional-devstack-stein-ansible-2.9
+        - ansible-collections-openstack-functional-devstack-wallaby-ansible-2.12
-        - ansible-collections-openstack-functional-devstack-rocky-ansible-2.9
+        - ansible-collections-openstack-functional-devstack-xena-ansible-2.12
-        - ansible-collections-openstack-functional-devstack-queens-ansible-2.9
+        - ansible-collections-openstack-functional-devstack-train-ansible-2.11
+        - ansible-collections-openstack-functional-devstack-octavia
+        - tripleo-ci-centos-8-standalone-wallaby-osa
 
+    periodic:
+      jobs:
+        - openstack-tox-linters-ansible-devel
+        - openstack-tox-linters-ansible-2.12
+        - openstack-tox-linters-ansible-2.9
+        - ansible-collections-openstack-functional-devstack
+        - ansible-collections-openstack-functional-devstack-releases
+        - ansible-collections-openstack-functional-devstack-ansible-2.9
+        - ansible-collections-openstack-functional-devstack-ansible-2.12
+        - ansible-collections-openstack-functional-devstack-ansible-devel
+        - ansible-collections-openstack-functional-devstack-xena-ansible-2.12
+        - ansible-collections-openstack-functional-devstack-wallaby-ansible-2.12
+        - ansible-collections-openstack-functional-devstack-victoria-ansible-2.12
+        - ansible-collections-openstack-functional-devstack-train-ansible-2.11
+        - ansible-collections-openstack-functional-devstack-queens-ansible-2.11
+        - bifrost-collections-src
+        - bifrost-keystone-collections-src
+        - ansible-collections-openstack-functional-devstack-octavia
+        - tripleo-ci-centos-9-standalone-wallaby-osa
+        - tripleo-ci-centos-9-standalone-osa
+        - tripleo-ci-centos-8-standalone-train-osa
+        - tripleo-ci-centos-8-standalone-wallaby-osa
+
+    experimental:
+      jobs:
+        - ansible-collections-openstack-functional-devstack-ansible-2.11
+        - ansible-collections-openstack-functional-devstack-victoria-ansible-2.12
+        - ansible-collections-openstack-functional-devstack-ussuri-ansible-2.11
+        - ansible-collections-openstack-functional-devstack-queens-ansible-2.11
+
+    tag:
+      jobs:
+        - ansible-collections-openstack-release

CHANGELOG.rst

@@ -0,0 +1,389 @@
+=============================================
+Openstack Cloud Ansilbe modules Release Notes
+=============================================
+
+.. contents:: Topics
+
+
+v1.7.0
+======
+
+Release Summary
+---------------
+
+New modules for Ironic and bugfixes
+
+Minor Changes
+-------------
+
+- openstack_inventory - Adds use_name variable
+- port - Add dns_[name,domain] to the port module
+- project - Remove project properties tests and support
+
+Bugfixes
+--------
+
+- identity_user_info - Fix identity user lookup with a domain
+- keystone_domain - Move identity domain to use proxy layer
+
+New Modules
+-----------
+
+- openstack.cloud.baremetal_node_info - Retrieve information about Bare Metal nodes from OpenStack an object.
+- openstack.cloud.baremetal_port - Create, Update, Remove ironic ports from OpenStack
+- openstack.cloud.baremetal_port_info - Retrieve information about Bare Metal ports from OpenStack an object.
+
+v1.6.0
+======
+
+Release Summary
+---------------
+
+New modules for RBAC and Nova services
+
+Minor Changes
+-------------
+
+- quota - Adds metadata_items parameter
+
+New Modules
+-----------
+
+- openstack.cloud.compute_service_info - Retrieve information about one or more OpenStack compute services
+- openstack.cloud.neutron_rbac_policies_info - Fetch Neutron policies.
+- openstack.cloud.neutron_rbac_policy - Create or delete a Neutron policy to apply a RBAC rule against an object.
+
+v1.5.3
+======
+
+Release Summary
+---------------
+
+Bugfixes
+
+Bugfixes
+--------
+
+- Don't require allowed_address_pairs for port
+- server_volume - check specified server is found
+
+v1.5.2
+======
+
+Release Summary
+---------------
+
+Bugfixes
+
+Minor Changes
+-------------
+
+- Add documentation links to README.md
+- Don't run functional jobs on galaxy.yml change
+- Move CI to use Ansible 2.12 version as main
+
+Bugfixes
+--------
+
+- Add client and member listener timeouts for persistence (Ex. SSH)
+- Added missing warn() used in cloud.openstack.quota
+- Fix issue with same host and group names
+- Flavor properties are not deleted on changes and id will stay
+
+v1.5.1
+======
+
+Release Summary
+---------------
+
+Bugfixes for networking modules
+
+Minor Changes
+-------------
+
+- Changed minversion in tox to 3.18.0
+- Update IRC server in README
+
+Bugfixes
+--------
+
+- Add mandatory requires_ansible version to metadata
+- Add protocol listener octavia
+- Add support check mode for all info modules
+- Allow to attach multiple floating ips to a server
+- Only add or remove router interfaces when needed
+- Wait for pool to be active and online
+
+v1.5.0
+======
+
+Release Summary
+---------------
+
+New modules for DNS and FIPs and bugfixes.
+
+Minor Changes
+-------------
+
+- Add bindep.txt for ansible-builder
+- Add check_mode attribute to OpenstackModule
+- Migrating image module from AnsibleModule to OpenStackModule
+- Switch KeystoneFederationProtocolInfo module to OpenStackModule
+- Switch ProjectAccess module to OpenStackModule
+- Switch Quota module to OpenStackModule
+- Switch Recordset module to OpenStackModule
+- Switch ServerGroup module to OpenStackModule
+- Switch ServerMetadata module to OpenStackModule
+- Switch Snapshot module to OpenStackModule
+- Switch Stack module to OpenStackModule
+- Switch auth module to OpenStackModule
+- Switch catalog_service module to OpenStackModule
+- Switch coe_cluster module to OpenStackModule
+- Switch coe_cluster_template module to OpenStackModule
+- Switch endpoint module to OpenStackModule
+- Switch federation_idp module to OpenStackModule
+- Switch federation_idp_info module to OpenStackModule
+- Switch federation_mapping module to OpenStackModule
+- Switch federation_mapping_info module to OpenStackModule
+- Switch federation_protocol module to OpenStackModule
+- Switch flavor module to OpenStackModule
+- Switch flavor_info module to OpenStackModule
+- Switch floating_ip module to OpenStackModule
+- Switch group_assignment module to OpenStackModule
+- Switch hostaggregate module to OpenStackModule
+- Switch identity_domain module to OpenStackModule
+- Switch identity_domain_info module to OpenStackModule
+- Switch identity_group module to OpenStackModule
+- Switch identity_group_info module to OpenStackModule
+- Switch identity_role module to OpenStackModule
+- Switch identity_user module to OpenStackModule
+- Switch lb_listener module to OpenStackModule
+- Switch lb_member module to OpenStackModule
+- Switch lb_pool module to OpenStackModule
+- Switch object module to OpenStackModule
+- Switch port module to OpenStackModule
+- Switch port_info module to OpenStackModule
+- Switch project and project_info module to OpenStackModule
+- Switch role_assignment module to OpenStackModule
+- Switch user_info module to OpenStackModule
+- image - Add support to setting image tags
+
+Bugfixes
+--------
+
+- Update checks for validate_certs in openstack_cloud_from_module
+- compute_flavor - Fix the idempotent of compute_flavor module
+- host_aggregate - Fix host_aggregate to tolerate aggregate.hosts being None
+- inventory/openstack - Fix inventory plugin on Ansible 2.11
+- port - fix update on empty list of allowed address pairs
+- setup.cfg Replace dashes with underscores
+- subnet - Only apply necessary changes to subnets
+- volume - Fail if referenced source image for a new volume does not exist
+
+New Modules
+-----------
+
+- openstack.cloud.address_scope - Create or delete address scopes from OpenStack
+- openstack.cloud.dns_zone_info - Getting information about dns zones
+- openstack.cloud.floating_ip_info - Get information about floating ips
+
+v1.4.0
+======
+
+Release Summary
+---------------
+
+New object_container module and bugfixes.
+
+Bugfixes
+--------
+
+- Add Octavia job for testing Load Balancer
+- Add binding profile to port module
+- Add execution environment metadata
+- Fix CI for latest ansible-test with no_log
+- Fix issues with newest ansible-test 2.11
+- Prepare for Ansible 2.11 tests
+- add option to exclude legacy groups
+- security_group_rule add support ipv6-icmp
+
+New Modules
+-----------
+
+- openstack.cloud.object_container - Manage Swift container
+
+v1.3.0
+======
+
+Release Summary
+---------------
+
+New modules and bugfixes.
+
+Minor Changes
+-------------
+
+- Fix some typos in readme
+- Guidelines Fix links and formatting
+- baremetal_node - Add support for new features
+- baremetal_node - ironic deprecate sub-options of driver_info
+- baremetal_node - ironic stop putting meaningless values to properties
+- image_info - Migrating image_info module from AnsibleModule to OpenStackModule
+- recordset -  Update recordset docu
+- server - Allow description field to be set with os_server
+- server_action - Added shelve and unshelve as new server actions
+
+Bugfixes
+--------
+
+- port - Fixed check for None in os_port
+- project - Fix setting custom property on os_project
+- security_group_rule - Remove protocols choice in security rules
+- volume_info - Fix volume_info result for SDK < 0.19
+
+New Modules
+-----------
+
+- openstack.cloud.identity_role_info - Retrieve information about Openstack Identity roles.
+- openstack.cloud.keypair_info - Retrieve information about Openstack key pairs.
+- openstack.cloud.security_group_info - Retrieve information about Openstack Security Groups.
+- openstack.cloud.security_group_rule_info - Retrieve information about Openstack Security Group rules.
+- openstack.cloud.stack_info - Retrieve information about Openstack Heat stacks.
+
+v1.2.1
+======
+
+Release Summary
+---------------
+
+Porting modules to new OpenstackModule class and fixes.
+
+Minor Changes
+-------------
+
+- dns_zone - Migrating dns_zone from AnsibleModule to OpenStackModule
+- dns_zone, recordset - Enable update for recordset and add tests for dns and recordset module
+- endpoint - Do not fail when endpoint state is absent
+- ironic - Refactor ironic authentication into a new module_utils module
+- loadbalancer - Refactor loadbalancer module
+- network - Migrating network from AnsibleModule to OpenStackModule
+- networks_info - Migrating networks_info from AnsibleModule to OpenStackModule
+- openstack - Add galaxy.yml to support install from git
+- openstack - Fix docs-args mismatch in modules
+- openstack - OpenStackModule Support defining a minimum version of the SDK
+- router - Migrating routers from AnsibleModule to OpenStackModule
+- routers_info - Added deprecated_names for router_info module
+- routers_info - Migrating routers_info from AnsibleModule to OpenStackModule
+- security_group.py - Migrating security_group from AnsibleModule to OpenStackModule
+- security_group_rule - Refactor TCP/UDP port check
+- server.py - Improve "server" module with OpenstackModule class
+- server_volume - Migrating server_volume from AnsibleModule to OpenStackModule
+- subnet - Fix subnets update and idempotency
+- subnet - Migrating subnet module from AnsibleModule to OpenStackModule
+- subnets_info - Migrating subnets_info from AnsibleModule to OpenStackModule
+- volume.py - Migrating volume from AnsibleModule to OpenStackModule
+- volume_info - Fix volume_info arguments for SDK 0.19
+
+v1.2.0
+======
+
+Release Summary
+---------------
+
+New volume backup modules.
+
+Minor Changes
+-------------
+
+- lb_health_monitor - Make it possible to create a health monitor to a pool
+
+New Modules
+-----------
+
+- openstack.cloud.volume_backup module - Add/Delete Openstack volumes backup.
+- openstack.cloud.volume_backup_info module - Retrieve information about Openstack volume backups.
+- openstack.cloud.volume_snapshot_info module - Retrieve information about Openstack volume snapshots.
+
+v1.1.0
+======
+
+Release Summary
+---------------
+
+Starting redesign modules and bugfixes.
+
+Minor Changes
+-------------
+
+- A basic module subclass was introduced and a few modules moved to inherit from it.
+- Add more useful information from exception
+- Added pip installation option for collection.
+- Added template for generation of artibtrary module.
+- baremetal modules - Do not require ironic_url if cloud or auth.endpoint is provided
+- inventory_openstack - Add openstack logger and Ansible display utility
+- loadbalancer - Add support for setting the Flavor when creating a load balancer
+
+Bugfixes
+--------
+
+- Fix non existing attribuites in SDK exception
+- security_group_rule - Don't pass tenant_id for remote group
+
+New Modules
+-----------
+
+- openstack.cloud.volume_info - Retrieve information about Openstack volumes.
+
+v1.0.1
+======
+
+Release Summary
+---------------
+
+Bugfix for server_info
+
+Bugfixes
+--------
+
+- server_info - Fix broken server_info module and add tests
+
+v1.0.0
+======
+
+Release Summary
+---------------
+
+Initial release of collection.
+
+Minor Changes
+-------------
+
+- Renaming all modules and removing "os" prefix from names.
+- baremetal_node_action - Support json type for the ironic_node config_drive parameter
+- config - Update os_client_config to use openstacksdk
+- host_aggregate - Add support for not 'purging' missing hosts
+- project - Add properties for os_project
+- server_action - pass imageRef to rebuild
+- subnet - Updated allocation pool checks
+
+Bugfixes
+--------
+
+- baremetal_node - Correct parameter name
+- coe_cluster - Retrive id/uuid correctly
+- federation_mapping - Fixup some minor nits found in followup reviews
+- inventory_openstack - Fix constructed compose
+- network - Bump minimum openstacksdk version when using os_network/dns_domain
+- role_assignment - Fix os_user_role for groups in multidomain context
+- role_assignment - Fix os_user_role issue to grant a role in a domain
+
+New Modules
+-----------
+
+- openstack.cloud.federation_idp - Add support for Keystone Identity Providers
+- openstack.cloud.federation_idp_info - Add support for fetching the information about federation IDPs
+- openstack.cloud.federation_mapping - Add support for Keystone mappings
+- openstack.cloud.federation_mapping_info - Add support for fetching the information about Keystone mappings
+- openstack.cloud.keystone_federation_protocol - Add support for Keystone federation Protocols
+- openstack.cloud.keystone_federation_protocol_info - Add support for getting information about Keystone federation Protocols
+- openstack.cloud.routers_info - Retrieve information about one or more OpenStack routers.

README.md

@@ -9,13 +9,37 @@ The collection includes the Openstack modules and plugins supported by Openstack
 
 ## Installation and Usage
 
+### Installing dependencies
+
+For using the Openstack Cloud collection firstly you need to install `ansible` and `openstacksdk` Python modules on your Ansible controller.
+For example with pip:
+
+```bash
+pip install ansible openstacksdk
+```
+
+OpenStackSDK has to be available to Ansible and to the Python interpreter on the host, where Ansible executes the module (target host).
+Please note, that under some circumstances Ansible might invoke a non-standard Python interpreter on the target host.
+Using Python version 3 is highly recommended for OpenstackSDK and strongly required from OpenstackSDK version 0.39.0.
+
+---
+
+#### NOTE
+
+OpenstackSDK is better to be the last stable version. It should NOT be installed on Openstack nodes,
+but rather on operators host (aka "Ansible controller"). OpenstackSDK from last version supports
+operations on all Openstack cloud versions. Therefore OpenstackSDK module version doesn't have to match
+Openstack cloud version usually.
+
+---
+
 ### Installing the Collection from Ansible Galaxy
 
 Before using the Openstack Cloud collection, you need to install the collection with the `ansible-galaxy` CLI:
 
 `ansible-galaxy collection install openstack.cloud`
 
-You can also include it in a `requirements.yml` file and install it via `ansible-galaxy collection install -r requirements.yml` using the format:
+You can also include it in a `requirements.yml` file and install it through `ansible-galaxy collection install -r requirements.yml` using the format:
 
 ```yaml
 collections:
@@ -24,7 +48,7 @@ collections:
 
 ### Playbooks
 
-To use a module from Openstack Cloud collection, please reference the full namespace, collection name, and modules name that you want to use:
+To use a module from the Openstack Cloud collection, please reference the full namespace, collection name, and module name that you want to use:
 
 ```yaml
 ---
@@ -42,7 +66,7 @@ To use a module from Openstack Cloud collection, please reference the full names
         volume_size: 75
 ```
 
-Or you can add full namepsace and collecton name in the `collections` element:
+Or you can add the full namespace and collection name in the `collections` element:
 
 ```yaml
 ---
@@ -59,13 +83,21 @@ Or you can add full namepsace and collecton name in the `collections` element:
         device: /dev/vdb
 ```
 
+### Usage
+
+See the collection docs at Ansible site:
+
+* [openstack.cloud collection docs (version released in Ansible package)](https://docs.ansible.com/ansible/latest/collections/openstack/cloud/index.html)
+
+* [openstack.cloud collection docs (devel version)](https://docs.ansible.com/ansible/devel/collections/openstack/cloud/index.html)
+
 ## Contributing
 
 For information on contributing, please see [CONTRIBUTING](https://opendev.org/openstack/ansible-collections-openstack/src/branch/master/CONTRIBUTING.rst)
 
 There are many ways in which you can participate in the project, for example:
 
-- Submit bugs and feature requests, and help us verify them
+- Submit [bugs and feature requests](https://storyboard.openstack.org/#!/project/openstack/ansible-collections-openstack), and help us verify them
 - Submit and review source code changes in [Openstack Gerrit](https://review.opendev.org/#/q/project:openstack/ansible-collections-openstack)
 - Add new modules for Openstack Cloud
 
@@ -90,7 +122,7 @@ TBD
 ## Communication
 
 We have a dedicated Interest Group for Openstack Ansible modules.
-You can find other people interested in this in `#openstack-ansible-sig` on Freenode IRC.
+You can find other people interested in this in `#openstack-ansible-sig` on [OFTC IRC](https://www.oftc.net/).
 
 ## License
 

bindep.txt

@@ -0,0 +1,7 @@
+# This is a cross-platform list tracking distribution packages needed by tests;
+# see https://docs.openstack.org/infra/bindep/ for additional information.
+
+gcc [compile platform:centos-8 platform:rhel-8]
+python38-cryptography [platform:centos-8 platform:rhel-8]
+python38-devel [compile platform:centos-8 platform:rhel-8]
+python38-requests [platform:centos-8 platform:rhel-8]

changelogs/changelog.yaml

@@ -0,0 +1,306 @@
+ancestor: null
+releases:
+  1.0.0:
+    changes:
+      bugfixes:
+      - baremetal_node - Correct parameter name
+      - coe_cluster - Retrive id/uuid correctly
+      - federation_mapping - Fixup some minor nits found in followup reviews
+      - inventory_openstack - Fix constructed compose
+      - network - Bump minimum openstacksdk version when using os_network/dns_domain
+      - role_assignment - Fix os_user_role for groups in multidomain context
+      - role_assignment - Fix os_user_role issue to grant a role in a domain
+      minor_changes:
+      - Renaming all modules and removing "os" prefix from names.
+      - baremetal_node_action - Support json type for the ironic_node config_drive
+        parameter
+      - config - Update os_client_config to use openstacksdk
+      - host_aggregate - Add support for not 'purging' missing hosts
+      - project - Add properties for os_project
+      - server_action - pass imageRef to rebuild
+      - subnet - Updated allocation pool checks
+      release_summary: Initial release of collection.
+    modules:
+    - description: Add support for Keystone Identity Providers
+      name: federation_idp
+      namespace: ''
+    - description: Add support for fetching the information about federation IDPs
+      name: federation_idp_info
+      namespace: ''
+    - description: Add support for Keystone mappings
+      name: federation_mapping
+      namespace: ''
+    - description: Add support for fetching the information about Keystone mappings
+      name: federation_mapping_info
+      namespace: ''
+    - description: Add support for Keystone federation Protocols
+      name: keystone_federation_protocol
+      namespace: ''
+    - description: Add support for getting information about Keystone federation Protocols
+      name: keystone_federation_protocol_info
+      namespace: ''
+    - description: Retrieve information about one or more OpenStack routers.
+      name: routers_info
+      namespace: ''
+    release_date: '2020-05-19'
+  1.0.1:
+    changes:
+      bugfixes:
+      - server_info - Fix broken server_info module and add tests
+      release_summary: Bugfix for server_info
+    release_date: '2020-05-22'
+  1.1.0:
+    changes:
+      bugfixes:
+      - Fix non existing attribuites in SDK exception
+      - security_group_rule - Don't pass tenant_id for remote group
+      minor_changes:
+      - A basic module subclass was introduced and a few modules moved to inherit
+        from it.
+      - Add more useful information from exception
+      - Added pip installation option for collection.
+      - Added template for generation of artibtrary module.
+      - baremetal modules - Do not require ironic_url if cloud or auth.endpoint is
+        provided
+      - inventory_openstack - Add openstack logger and Ansible display utility
+      - loadbalancer - Add support for setting the Flavor when creating a load balancer
+      release_summary: Starting redesign modules and bugfixes.
+    modules:
+    - description: Retrieve information about Openstack volumes.
+      name: volume_info
+      namespace: ''
+    release_date: '2020-08-17'
+  1.2.0:
+    changes:
+      minor_changes:
+      - lb_health_monitor - Make it possible to create a health monitor to a pool
+      release_summary: New volume backup modules.
+    modules:
+    - description: Add/Delete Openstack volumes backup.
+      name: volume_backup module
+      namespace: ''
+    - description: Retrieve information about Openstack volume backups.
+      name: volume_backup_info module
+      namespace: ''
+    - description: Retrieve information about Openstack volume snapshots.
+      name: volume_snapshot_info module
+      namespace: ''
+    release_date: '2020-10-13'
+  1.2.1:
+    changes:
+      minor_changes:
+      - dns_zone - Migrating dns_zone from AnsibleModule to OpenStackModule
+      - dns_zone, recordset - Enable update for recordset and add tests for dns and
+        recordset module
+      - endpoint - Do not fail when endpoint state is absent
+      - ironic - Refactor ironic authentication into a new module_utils module
+      - loadbalancer - Refactor loadbalancer module
+      - network - Migrating network from AnsibleModule to OpenStackModule
+      - networks_info - Migrating networks_info from AnsibleModule to OpenStackModule
+      - openstack - Add galaxy.yml to support install from git
+      - openstack - Fix docs-args mismatch in modules
+      - openstack - OpenStackModule Support defining a minimum version of the SDK
+      - router - Migrating routers from AnsibleModule to OpenStackModule
+      - routers_info - Added deprecated_names for router_info module
+      - routers_info - Migrating routers_info from AnsibleModule to OpenStackModule
+      - security_group.py - Migrating security_group from AnsibleModule to OpenStackModule
+      - security_group_rule - Refactor TCP/UDP port check
+      - server.py - Improve "server" module with OpenstackModule class
+      - server_volume - Migrating server_volume from AnsibleModule to OpenStackModule
+      - subnet - Fix subnets update and idempotency
+      - subnet - Migrating subnet module from AnsibleModule to OpenStackModule
+      - subnets_info - Migrating subnets_info from AnsibleModule to OpenStackModule
+      - volume.py - Migrating volume from AnsibleModule to OpenStackModule
+      - volume_info - Fix volume_info arguments for SDK 0.19
+      release_summary: Porting modules to new OpenstackModule class and fixes.
+    release_date: '2021-01-03'
+  1.3.0:
+    changes:
+      bugfixes:
+      - port - Fixed check for None in os_port
+      - project - Fix setting custom property on os_project
+      - security_group_rule - Remove protocols choice in security rules
+      - volume_info - Fix volume_info result for SDK < 0.19
+      minor_changes:
+      - Fix some typos in readme
+      - Guidelines Fix links and formatting
+      - baremetal_node - Add support for new features
+      - baremetal_node - ironic deprecate sub-options of driver_info
+      - baremetal_node - ironic stop putting meaningless values to properties
+      - image_info - Migrating image_info module from AnsibleModule to OpenStackModule
+      - recordset -  Update recordset docu
+      - server - Allow description field to be set with os_server
+      - server_action - Added shelve and unshelve as new server actions
+      release_summary: New modules and bugfixes.
+    modules:
+    - description: Retrieve information about Openstack Identity roles.
+      name: identity_role_info
+      namespace: ''
+    - description: Retrieve information about Openstack key pairs.
+      name: keypair_info
+      namespace: ''
+    - description: Retrieve information about Openstack Security Groups.
+      name: security_group_info
+      namespace: ''
+    - description: Retrieve information about Openstack Security Group rules.
+      name: security_group_rule_info
+      namespace: ''
+    - description: Retrieve information about Openstack Heat stacks.
+      name: stack_info
+      namespace: ''
+    release_date: '2021-02-16'
+  1.4.0:
+    changes:
+      bugfixes:
+      - Add Octavia job for testing Load Balancer
+      - Add binding profile to port module
+      - Add execution environment metadata
+      - Fix CI for latest ansible-test with no_log
+      - Fix issues with newest ansible-test 2.11
+      - Prepare for Ansible 2.11 tests
+      - add option to exclude legacy groups
+      - security_group_rule add support ipv6-icmp
+      release_summary: New object_container module and bugfixes.
+    modules:
+    - description: Manage Swift container
+      name: object_container
+      namespace: ''
+    release_date: '2021-04-08'
+  1.5.0:
+    changes:
+      bugfixes:
+      - Update checks for validate_certs in openstack_cloud_from_module
+      - compute_flavor - Fix the idempotent of compute_flavor module
+      - host_aggregate - Fix host_aggregate to tolerate aggregate.hosts being None
+      - inventory/openstack - Fix inventory plugin on Ansible 2.11
+      - port - fix update on empty list of allowed address pairs
+      - setup.cfg Replace dashes with underscores
+      - subnet - Only apply necessary changes to subnets
+      - volume - Fail if referenced source image for a new volume does not exist
+      minor_changes:
+      - Add bindep.txt for ansible-builder
+      - Add check_mode attribute to OpenstackModule
+      - Migrating image module from AnsibleModule to OpenStackModule
+      - Switch KeystoneFederationProtocolInfo module to OpenStackModule
+      - Switch ProjectAccess module to OpenStackModule
+      - Switch Quota module to OpenStackModule
+      - Switch Recordset module to OpenStackModule
+      - Switch ServerGroup module to OpenStackModule
+      - Switch ServerMetadata module to OpenStackModule
+      - Switch Snapshot module to OpenStackModule
+      - Switch Stack module to OpenStackModule
+      - Switch auth module to OpenStackModule
+      - Switch catalog_service module to OpenStackModule
+      - Switch coe_cluster module to OpenStackModule
+      - Switch coe_cluster_template module to OpenStackModule
+      - Switch endpoint module to OpenStackModule
+      - Switch federation_idp module to OpenStackModule
+      - Switch federation_idp_info module to OpenStackModule
+      - Switch federation_mapping module to OpenStackModule
+      - Switch federation_mapping_info module to OpenStackModule
+      - Switch federation_protocol module to OpenStackModule
+      - Switch flavor module to OpenStackModule
+      - Switch flavor_info module to OpenStackModule
+      - Switch floating_ip module to OpenStackModule
+      - Switch group_assignment module to OpenStackModule
+      - Switch hostaggregate module to OpenStackModule
+      - Switch identity_domain module to OpenStackModule
+      - Switch identity_domain_info module to OpenStackModule
+      - Switch identity_group module to OpenStackModule
+      - Switch identity_group_info module to OpenStackModule
+      - Switch identity_role module to OpenStackModule
+      - Switch identity_user module to OpenStackModule
+      - Switch lb_listener module to OpenStackModule
+      - Switch lb_member module to OpenStackModule
+      - Switch lb_pool module to OpenStackModule
+      - Switch object module to OpenStackModule
+      - Switch port module to OpenStackModule
+      - Switch port_info module to OpenStackModule
+      - Switch project and project_info module to OpenStackModule
+      - Switch role_assignment module to OpenStackModule
+      - Switch user_info module to OpenStackModule
+      - image - Add support to setting image tags
+      release_summary: New modules for DNS and FIPs and bugfixes.
+    modules:
+    - description: Create or delete address scopes from OpenStack
+      name: address_scope
+      namespace: ''
+    - description: Getting information about dns zones
+      name: dns_zone_info
+      namespace: ''
+    - description: Get information about floating ips
+      name: floating_ip_info
+      namespace: ''
+    release_date: '2021-06-23'
+  1.5.1:
+    changes:
+      bugfixes:
+      - Add mandatory requires_ansible version to metadata
+      - Add protocol listener octavia
+      - Add support check mode for all info modules
+      - Allow to attach multiple floating ips to a server
+      - Only add or remove router interfaces when needed
+      - Wait for pool to be active and online
+      minor_changes:
+      - Changed minversion in tox to 3.18.0
+      - Update IRC server in README
+      release_summary: Bugfixes for networking modules
+    release_date: '2021-09-02'
+  1.5.2:
+    changes:
+      bugfixes:
+      - Add client and member listener timeouts for persistence (Ex. SSH)
+      - Added missing warn() used in cloud.openstack.quota
+      - Fix issue with same host and group names
+      - Flavor properties are not deleted on changes and id will stay
+      minor_changes:
+      - Add documentation links to README.md
+      - Don't run functional jobs on galaxy.yml change
+      - Move CI to use Ansible 2.12 version as main
+      release_summary: Bugfixes
+    release_date: '2021-11-09'
+  1.5.3:
+    changes:
+      bugfixes:
+      - Don't require allowed_address_pairs for port
+      - server_volume - check specified server is found
+      release_summary: Bugfixes
+    release_date: '2021-11-11'
+  1.6.0:
+    changes:
+      minor_changes:
+      - quota - Adds metadata_items parameter
+      release_summary: New modules for RBAC and Nova services
+    modules:
+    - description: Retrieve information about one or more OpenStack compute services
+      name: compute_service_info
+      namespace: ''
+    - description: Fetch Neutron policies.
+      name: neutron_rbac_policies_info
+      namespace: ''
+    - description: Create or delete a Neutron policy to apply a RBAC rule against
+        an object.
+      name: neutron_rbac_policy
+      namespace: ''
+    release_date: '2022-01-13'
+  1.7.0:
+    changes:
+      bugfixes:
+      - identity_user_info - Fix identity user lookup with a domain
+      - keystone_domain - Move identity domain to use proxy layer
+      minor_changes:
+      - openstack_inventory - Adds use_name variable
+      - port - Add dns_[name,domain] to the port module
+      - project - Remove project properties tests and support
+      release_summary: New modules for Ironic and bugfixes
+    modules:
+    - description: Retrieve information about Bare Metal nodes from OpenStack an object.
+      name: baremetal_node_info
+      namespace: ''
+    - description: Create, Update, Remove ironic ports from OpenStack
+      name: baremetal_port
+      namespace: ''
+    - description: Retrieve information about Bare Metal ports from OpenStack an object.
+      name: baremetal_port_info
+      namespace: ''
+    release_date: '2022-02-15'

changelogs/config.yaml

@@ -0,0 +1,31 @@
+changelog_filename_template: ../CHANGELOG.rst
+changelog_filename_version_depth: 0
+changes_file: changelog.yaml
+changes_format: combined
+ignore_other_fragment_extensions: true
+keep_fragments: false
+mention_ancestor: true
+new_plugins_after_name: removed_features
+notesdir: fragments
+prelude_section_name: release_summary
+prelude_section_title: Release Summary
+sections:
+- - major_changes
+  - Major Changes
+- - minor_changes
+  - Minor Changes
+- - breaking_changes
+  - Breaking Changes / Porting Guide
+- - deprecated_features
+  - Deprecated Features
+- - removed_features
+  - Removed Features (previously deprecated)
+- - security_fixes
+  - Security Fixes
+- - bugfixes
+  - Bugfixes
+- - known_issues
+  - Known Issues
+title: Openstack Cloud Ansilbe modules
+trivial_section_name: trivial
+use_fqcn: true

changelogs/fragments/62062-os_network-openstacksdk-min.yml

@@ -1,3 +0,0 @@
-bugfixes:
-  - Bump the minimum openstacksdk version to 0.18.0 when os_network
-    uses the port_security_enabled or mtu arguments.

changelogs/fragments/64495-os_network-openstacksdk-min.yml

@@ -1,3 +0,0 @@
-bugfixes:
-  - Bump the minimum openstacksdk version to 0.29.0 when os_network
-    uses the dns_domain argument.

changelogs/fragments/67576-os_coe_cluster-retrieve-id-uuid-correctly.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- os_coe_cluster: Retrieve the correct id/uuid depending on whether it is a create/get request.

changelogs/fragments/openstack_inventory.yml

@@ -1,2 +0,0 @@
-minor_changes:
-- Moved Openstack inventory script from Ansible community.general to openstack collection.

ci/playbooks/get_amphora_tarball.yaml

@@ -0,0 +1,6 @@
+- hosts: all
+  tasks:
+    - name: Download amphora tarball
+      get_url:
+        url: "https://tarballs.openstack.org/octavia/test-images/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2"
+        dest: /tmp/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2

ci/playbooks/postlog.yaml

@@ -0,0 +1,8 @@
+- hosts: all
+  tasks:
+    - zuul_return:
+        data:
+          zuul:
+            artifacts:
+              - name: Test log
+                url: controller/logs/test_output_log.txt

ci/publish/publish_collection.yml

@@ -0,0 +1,75 @@
+---
+- hosts: all
+  vars:
+    collection_path: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/ansible-collections-openstack'].src_dir }}"
+    build_collection_path: /tmp/collection_built/
+    ansible_galaxy_path: "~/.local/bin/ansible-galaxy"
+
+  tasks:
+
+    - name: Include role for pip
+      include_role:
+        name: ensure-pip
+
+    - name: Install ansible
+      pip:
+        name: ansible-core<2.12
+
+    - name: Discover tag version
+      set_fact:
+        version_tag: "{{ zuul.tag|default('no_version', true) }}"
+
+    - name: Fail if no tag version found
+      fail:
+        msg: "No tag was found in Zuul vars!"
+      when: version_tag == 'no_version'
+
+    - name: Create a directory for collection
+      file:
+        state: "{{ item }}"
+        path: "{{ build_collection_path }}"
+      loop:
+        - absent
+        - directory
+
+    - name: Set galaxy.yml for right version from tag
+      lineinfile:
+        path: '{{ collection_path }}/galaxy.yml'
+        regexp: '^version:.*'
+        line: 'version: {{ version_tag }}'
+
+    - name: Build collection
+      command: "{{ ansible_galaxy_path }} collection build --output-path {{ build_collection_path }} --force"
+      args:
+        chdir: "{{ collection_path }}"
+
+    - name: Publish content to Ansible Galaxy
+      block:
+        - name: Create ansible.cfg configuration file tempfile
+          tempfile:
+            state: file
+            suffix: .cfg
+          register: _ansiblecfg_tmp
+
+        - name: Create ansible.cfg configuration file
+          copy:
+            dest: "{{ _ansiblecfg_tmp.path }}"
+            mode: 0600
+            content: |
+              [galaxy]
+              server_list = release_galaxy
+
+              [galaxy_server.release_galaxy]
+              url = {{ ansible_galaxy_info.url }}
+              token = {{ ansible_galaxy_info.token }}
+
+        - name: Publish collection to Ansible Galaxy / Automation Hub
+          environment:
+            ANSIBLE_CONFIG: "{{ _ansiblecfg_tmp.path }}"
+          shell: >-
+            {{ ansible_galaxy_path }} collection publish -vvv
+            {{ build_collection_path }}/openstack-cloud-{{ version_tag }}.tar.gz
+
+      always:
+        - name: Shred ansible-galaxy credentials
+          command: "shred {{ _ansiblecfg_tmp.path }}"

ci/roles/address_scope/defaults/main.yml

@@ -0,0 +1 @@
+address_scope_name: "adrdess_scope"

ci/roles/address_scope/tasks/main.yml

@@ -0,0 +1,40 @@
+---
+- name: Create address_scope
+  openstack.cloud.address_scope:
+    cloud: "{{ cloud }}"
+    name: "{{ address_scope_name }}"
+    shared: False
+    ip_version: "4"
+  register: create_address_scope
+
+- name: Verify address scope
+  assert:
+    that:
+      - create_address_scope is successful
+      - create_address_scope is changed
+      - create_address_scope.address_scope.name == address_scope_name
+      - create_address_scope.address_scope.is_shared ==  False
+      - create_address_scope.address_scope.ip_version == 4
+
+- name: Update address scope
+  openstack.cloud.address_scope:
+    cloud: "{{ cloud }}"
+    name: "{{ address_scope_name }}"
+    shared: True
+    ip_version: "4"
+  register: update_address_scope
+
+- name: Verify updated IPv4 address scope
+  assert:
+    that:
+      - update_address_scope is successful
+      - update_address_scope is changed
+      - update_address_scope.address_scope.name == address_scope_name
+      - update_address_scope.address_scope.is_shared ==  True
+      - update_address_scope.address_scope.ip_version == 4
+
+- name: Delete created address scope
+  openstack.cloud.address_scope:
+    cloud: "{{ cloud }}"
+    name: "{{ address_scope_name }}"
+    state: absent

ci/roles/dns/defaults/main.yml

@@ -0,0 +1,4 @@
+dns_zone_name: test.dns.zone.
+recordset_name: testrecordset.test.dns.zone.
+records: ['10.0.0.0']
+updated_records: ['10.1.1.1']

ci/roles/dns/tasks/main.yml

@@ -0,0 +1,79 @@
+---
+- name: Create dns zone
+  openstack.cloud.dns_zone:
+    cloud: "{{ cloud }}"
+    name: "{{ dns_zone_name }}"
+    zone_type: "primary"
+    email: test@example.net
+  register: dns_zone
+
+- debug: var=dns_zone
+
+- name: Update dns zone
+  openstack.cloud.dns_zone:
+    cloud: "{{ cloud }}"
+    name: "{{ dns_zone.zone.name }}"
+    description: "New descirption"
+  register: updated_dns_zone
+
+- debug: var=updated_dns_zone
+
+- name: Create a recordset
+  openstack.cloud.recordset:
+    cloud: "{{ cloud }}"
+    zone: "{{ updated_dns_zone.zone.name }}"
+    name: "{{ recordset_name }}"
+    recordset_type: "a"
+    records: "{{ records }}"
+  register: recordset
+
+- name: Verify recordset info
+  assert:
+    that:
+      - recordset["recordset"].name == recordset_name
+      - recordset["recordset"].zone_name ==  dns_zone.zone.name
+      - recordset["recordset"].records == records
+
+- name: Update a recordset
+  openstack.cloud.recordset:
+    cloud: "{{ cloud }}"
+    zone: "{{ updated_dns_zone.zone.name }}"
+    name: "{{ recordset_name }}"
+    recordset_type: "a"
+    records: "{{ updated_records }}"
+    description: "new test recordset"
+  register: updated_recordset
+
+- name: Verify recordset info
+  assert:
+    that:
+      - updated_recordset["recordset"].zone_name == dns_zone.zone.name
+      - updated_recordset["recordset"].name == recordset_name
+      - updated_recordset["recordset"].records == updated_records
+
+- name: Delete recordset
+  openstack.cloud.recordset:
+    cloud: "{{ cloud }}"
+    zone: "{{ updated_dns_zone.zone.name }}"
+    name: "{{ recordset.recordset.name }}"
+    state: absent
+  register: deleted_recordset
+
+- name: Verify recordset deletion
+  assert:
+    that:
+    - deleted_recordset is successful
+    - deleted_recordset is changed
+
+- name: Delete dns zone
+  openstack.cloud.dns_zone:
+    cloud: "{{ cloud }}"
+    name: "{{ updated_dns_zone.zone.name }}"
+    state: absent
+  register: deleted_dns_zone
+
+- name: Verify dns zone
+  assert:
+    that:
+    - deleted_dns_zone is successful
+    - deleted_dns_zone is changed

ci/roles/dns_zone_info/tasks/main.yml

@@ -0,0 +1,41 @@
+---
+- name: Set random prefix
+  set_fact:
+    prefix: "{{ 99999999 | random | to_uuid | hash('md5') }}"
+
+- name: Create dns zone
+  openstack.cloud.dns_zone:
+    cloud: "{{ cloud }}"
+    name: "{{ (prefix + '.test.zone.') }}"
+    email: test@example.net
+
+- name: Getting info about dns zones
+  openstack.cloud.dns_zone_info:
+    cloud: "{{ cloud }}"
+  register: zones
+
+- name: assert result
+  assert:
+    that:
+      - zones is success
+      - zones is not changed
+      - zones | length > 0
+
+- name: Getting info about created zone
+  openstack.cloud.dns_zone_info:
+    cloud: "{{ cloud }}"
+    name: "{{ (prefix + '.test.zone.') }}"
+  register: zone
+
+- name: assert result
+  assert:
+    that:
+      - zone is success
+      - zone is not changed
+      - zone.zones | length == 1
+
+- name: Drop created dns zone
+  openstack.cloud.dns_zone:
+    cloud: "{{ cloud }}"
+    name: "{{ (prefix + '.test.zone.') }}"
+    state: absent

ci/roles/floating_ip/tasks/main.yml

@@ -0,0 +1,466 @@
+---
+# Prepare environment
+- name: Gather information about public network
+  openstack.cloud.networks_info:
+    cloud: "{{ cloud }}"
+    name: public
+  register: public_network
+
+- name: Assert that public network exists
+  assert:
+    that: public_network.openstack_networks|length == 1
+
+- name: Create external network
+  openstack.cloud.network:
+     cloud: "{{ cloud }}"
+     state: present
+     name: ansible_external
+     external: true
+
+- name: Create external subnet
+  openstack.cloud.subnet:
+     cloud: "{{ cloud }}"
+     state: present
+     network_name: ansible_external
+     name: ansible_external_subnet
+     cidr: 10.6.6.0/24
+
+- name: Create external port 1
+  openstack.cloud.port:
+     cloud: "{{ cloud }}"
+     state: present
+     name: ansible_external_port1
+     network: ansible_external
+     fixed_ips:
+       - ip_address: 10.6.6.50
+
+- name: Create external port 2
+  openstack.cloud.port:
+     cloud: "{{ cloud }}"
+     state: present
+     name: ansible_external_port2
+     network: ansible_external
+     fixed_ips:
+       - ip_address: 10.6.6.51
+
+- name: Create internal network
+  openstack.cloud.network:
+     cloud: "{{ cloud }}"
+     state: present
+     name: ansible_internal
+     external: false
+
+- name: Create internal subnet
+  openstack.cloud.subnet:
+     cloud: "{{ cloud }}"
+     state: present
+     network_name: ansible_internal
+     name: ansible_internal_subnet
+     cidr: 10.7.7.0/24
+
+- name: Create internal port 1
+  openstack.cloud.port:
+     cloud: "{{ cloud }}"
+     state: present
+     name: ansible_internal_port1
+     network: ansible_internal
+     fixed_ips:
+       - ip_address: 10.7.7.100
+
+- name: Create internal port 2
+  openstack.cloud.port:
+     cloud: "{{ cloud }}"
+     state: present
+     name: ansible_internal_port2
+     network: ansible_internal
+     fixed_ips:
+       - ip_address: 10.7.7.101
+
+- name: Create internal port 3
+  openstack.cloud.port:
+     cloud: "{{ cloud }}"
+     state: present
+     name: ansible_internal_port3
+     network: ansible_internal
+     fixed_ips:
+       - ip_address: 10.7.7.102
+
+- name: Create router 1
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: present
+     name: ansible_router1
+     network: ansible_external
+     external_fixed_ips:
+        - subnet: ansible_external_subnet
+          ip: 10.6.6.10
+     interfaces:
+         - net: ansible_internal
+           subnet: ansible_internal_subnet
+           portip: 10.7.7.1
+
+# Router 2 is required for the simplest, first test that assigns a new floating IP to server
+# from first available external network or nova pool which is DevStack's public network
+- name: Create router 2
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: present
+     name: ansible_router2
+     network: public
+     interfaces:
+         - net: ansible_internal
+           subnet: ansible_internal_subnet
+           portip: 10.7.7.10
+
+- name: Get all floating ips
+  openstack.cloud.floating_ip_info:
+     cloud: "{{ cloud }}"
+  register: fips
+
+- name: Check if public network has any floating ips
+  set_fact:
+     public_network_had_fips: "{{ fips.floating_ips|
+                                  selectattr('floating_network_id', '==', public_network.openstack_networks.0.id)|
+                                  list|length > 0 }}"
+
+# TODO: Replace with appropriate Ansible module once available
+- name: Create a floating ip on public network (required for simplest, first floating ip test)
+  command: openstack --os-cloud={{ cloud }} floating ip create public
+  when: not public_network_had_fips
+
+# TODO: Replace with appropriate Ansible module once available
+- name: Create floating ip 1 on external network
+  command: >
+    openstack --os-cloud={{ cloud }} floating ip create
+        --subnet ansible_external_subnet
+        --floating-ip-address 10.6.6.150
+        ansible_external
+  when: fips.floating_ips|length == 0 or
+        "10.6.6.150" not in fips.floating_ips|map(attribute="floating_ip_address")|list
+
+- name: Create server with one nic
+  openstack.cloud.server:
+     cloud: "{{ cloud }}"
+     state: present
+     name: ansible_server1
+     image: "{{ image }}"
+     flavor: m1.tiny
+     nics:
+         # one nic only else simple, first floating ip test does not work
+         - port-name: ansible_internal_port1
+     auto_ip: false
+     wait: true
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: ansible_server1
+  register: info
+
+- name: Assert one internal port and no floating ips on server 1
+  # If this assertion fails because server has an public ipv4 address (public_v4) then make sure
+  # that no floating ip on public network is associated with "10.7.7.100" before running this role
+  assert:
+    that:
+      - info.openstack_servers|length == 1
+      - info.openstack_servers.0.public_v4|length == 0
+      - info.openstack_servers.0.public_v6|length == 0
+      - info.openstack_servers.0.addresses.ansible_internal|length == 1
+      - info.openstack_servers.0.addresses.ansible_internal|map(attribute="addr")|sort|list == ["10.7.7.100"]
+
+- name: Create server with two nics
+  openstack.cloud.server:
+     cloud: "{{ cloud }}"
+     state: present
+     name: ansible_server2
+     image: "{{ image }}"
+     flavor: m1.tiny
+     nics:
+         - port-name: ansible_internal_port2
+         - port-name: ansible_internal_port3
+     auto_ip: false
+     wait: true
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: ansible_server2
+  register: info
+
+- name: Assert two internal ports and no floating ips on server 2
+  assert:
+    that:
+      - info.openstack_servers|length == 1
+      - info.openstack_servers.0.public_v4|length == 0
+      - info.openstack_servers.0.public_v6|length == 0
+      - info.openstack_servers.0.addresses.ansible_internal|length == 2
+      - info.openstack_servers.0.addresses.ansible_internal|map(attribute="addr")|sort|list ==
+        ["10.7.7.101", "10.7.7.102"]
+
+# Tests
+- name: Assign new floating IP to server from first available external network or nova pool
+  openstack.cloud.floating_ip:
+     cloud: "{{ cloud }}"
+     state: present
+     server: ansible_server1
+     wait: true
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: ansible_server1
+  register: info
+
+- name: Assert one internal port and one floating ip on server 1
+  assert:
+    that:
+      - info.openstack_servers.0.addresses.ansible_internal|length == 2
+      - info.openstack_servers.0.addresses.ansible_internal|map(attribute="OS-EXT-IPS:type")|sort|list ==
+        ["fixed", "floating"]
+
+- name: Detach floating IP from server
+  openstack.cloud.floating_ip:
+     cloud: "{{ cloud }}"
+     state: absent
+     server: ansible_server1
+     network: public
+     floating_ip_address: "{{ (info.openstack_servers.0.addresses.ansible_internal|
+                               selectattr('OS-EXT-IPS:type', '==', 'floating')|map(attribute='addr')|list)[0] }}"
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: ansible_server1
+  register: info
+  # When detaching a floating ip from an instance there might be a delay until openstack.cloud.server_info
+  # does not list it any more in info.openstack_servers.0.addresses.ansible_internal, so retry if necessary.
+  retries: 10
+  delay: 3
+  until: info.openstack_servers.0.addresses.ansible_internal|length == 1
+
+- name: Assert one internal port on server 1
+  assert:
+    that:
+      - info.openstack_servers.0.addresses.ansible_internal|length == 1
+      - info.openstack_servers.0.addresses.ansible_internal|map(attribute="addr")|list == ["10.7.7.100"]
+
+- name: Assign floating IP to server
+  openstack.cloud.floating_ip:
+     cloud: "{{ cloud }}"
+     state: present
+     reuse: yes
+     server: ansible_server2
+     network: public
+     fixed_address: 10.7.7.101
+     wait: true
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: ansible_server2
+  register: info
+
+- name: Assert two internal ports and one floating ip on server 2
+  assert:
+    that:
+      - info.openstack_servers.0.addresses.ansible_internal|length == 3
+      - info.openstack_servers.0.addresses.ansible_internal|map(attribute="OS-EXT-IPS:type")|sort|list ==
+        ["fixed", "fixed", "floating"]
+
+- name: Assign a second, specific floating IP to server
+  openstack.cloud.floating_ip:
+     cloud: "{{ cloud }}"
+     state: present
+     reuse: yes
+     server: ansible_server2
+     network: ansible_external
+     fixed_address: 10.7.7.102
+     floating_ip_address: "10.6.6.150"
+
+# We cannot wait for second floating ip to be attached because OpenStackSDK checks only for first floating ip
+# Ref.: https://github.com/openstack/openstacksdk/blob/e0372b72af8c5f471fc17e53434d7a814ca958bd/openstack/cloud/_floating_ip.py#L733
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: ansible_server2
+  register: info
+  # retry because we cannot wait for second floating ip
+  retries: 10
+  delay: 3
+  until: info.openstack_servers.0.addresses.ansible_internal|length == 4
+
+- name: Assert two internal ports and two floating ips on server 2
+  assert:
+    that:
+      - info.openstack_servers.0.addresses.ansible_internal|length == 4
+      - ("10.6.6.150" in info.openstack_servers.0.addresses.ansible_internal|map(attribute="addr")|sort|list)
+
+- name: Detach second floating IP from server
+  openstack.cloud.floating_ip:
+     cloud: "{{ cloud }}"
+     state: absent
+     server: ansible_server2
+     network: ansible_external
+     floating_ip_address: "10.6.6.150"
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: ansible_server2
+  register: info
+  # When detaching a floating ip from an instance there might be a delay until openstack.cloud.server_info
+  # does not list it any more in info.openstack_servers.0.addresses.ansible_internal, so retry if necessary.
+  retries: 10
+  delay: 3
+  until: info.openstack_servers.0.addresses.ansible_internal|length == 3
+
+- name: Assert two internal ports and one floating ip on server 2
+  assert:
+    that:
+      - info.openstack_servers.0.addresses.ansible_internal|length == 3
+
+- name: Detach remaining floating IP from server
+  openstack.cloud.floating_ip:
+     cloud: "{{ cloud }}"
+     state: absent
+     server: ansible_server2
+     network: public
+     floating_ip_address: "{{ (info.openstack_servers.0.addresses.ansible_internal|
+                               selectattr('OS-EXT-IPS:type', '==', 'floating')|map(attribute='addr')|list)[0] }}"
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: ansible_server2
+  register: info
+  # When detaching a floating ip from an instance there might be a delay until openstack.cloud.server_info
+  # does not list it any more in info.openstack_servers.0.addresses.ansible_internal, so retry if necessary.
+  retries: 10
+  delay: 3
+  until: info.openstack_servers.0.addresses.ansible_internal|length == 2
+
+- name: Assert two internal ports on server 2
+  assert:
+    that:
+      - info.openstack_servers.0.addresses.ansible_internal|length == 2
+      - info.openstack_servers.0.addresses.ansible_internal|map(attribute="addr")|list == ["10.7.7.101", "10.7.7.102"]
+
+# Clean environment
+- name: Delete server with two nics
+  openstack.cloud.server:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_server2
+     wait: true
+
+- name: Delete server with one nic
+  openstack.cloud.server:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_server1
+     wait: true
+
+- name: Get all floating ips
+  openstack.cloud.floating_ip_info:
+     cloud: "{{ cloud }}"
+  register: fips
+
+# TODO: Replace with appropriate Ansible module once available
+- name: Delete floating ip on public network if we created it
+  when: not public_network_had_fips
+  command: >
+    openstack --os-cloud={{ cloud }} floating ip delete
+        {{ fips.floating_ips|selectattr('floating_network_id', '==', public_network.openstack_networks.0.id)|
+           map(attribute="floating_ip_address")|list|join(' ') }}
+
+# TODO: Replace with appropriate Ansible module once available
+- name: Delete floating ip 1
+  command: openstack --os-cloud={{ cloud }} floating ip delete 10.6.6.150
+  when: fips.floating_ips|length > 0 and "10.6.6.150" in fips.floating_ips|map(attribute="floating_ip_address")|list
+
+- name: Get remaining floating ips on external network
+  openstack.cloud.floating_ip_info:
+     cloud: "{{ cloud }}"
+     floating_network: ansible_external
+  register: fips
+
+# TODO: Replace with appropriate Ansible module once available
+# The first, simple floating ip test might have allocated a floating ip on the external network.
+# This floating ip must be removed before external network can be deleted.
+- name: Delete remaining floating ips on external network
+  when: fips.floating_ips|length > 0
+  command: >
+    openstack --os-cloud={{ cloud }} floating ip delete
+        {{ fips.floating_ips|map(attribute="floating_ip_address")|list|join(' ') }}
+
+# Remove routers after floating ips have been detached and disassociated else removal fails with
+#  Error detaching interface from router ***: Client Error for url: ***,
+#  Router interface for subnet *** on router *** cannot be deleted, 
+#  as it is required by one or more floating IPs.
+
+- name: Delete router 2
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_router2
+
+- name: Delete router 1
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_router1
+
+- name: Delete internal port 3
+  openstack.cloud.port:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_internal_port3
+
+- name: Delete internal port 2
+  openstack.cloud.port:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_internal_port2
+
+- name: Delete internal port 1
+  openstack.cloud.port:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_internal_port1
+
+- name: Delete internal subnet
+  openstack.cloud.subnet:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_internal_subnet
+
+- name: Delete internal network
+  openstack.cloud.network:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_internal
+
+- name: Delete external port 2
+  openstack.cloud.port:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_external_port2
+
+- name: Delete external port 1
+  openstack.cloud.port:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_external_port1
+
+- name: Delete external subnet
+  openstack.cloud.subnet:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_external_subnet
+
+- name: Delete external network
+  openstack.cloud.network:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_external

ci/roles/floating_ip_info/tasks/main.yml

@@ -0,0 +1,11 @@
+---
+- name: Getting info about allocated ips
+  openstack.cloud.floating_ip_info:
+    cloud: "{{ cloud }}"
+  register: fips
+
+- name: assert result
+  assert:
+    that:
+      - fips is success
+      - fips is not changed

ci/roles/image/defaults/main.yml

@@ -1 +1,4 @@
 image_name: ansible_image
+image_tags:
+  - test
+  - ansible

ci/roles/image/tasks/main.yml

@@ -13,9 +13,20 @@
      name: "{{ image_name }}"
      filename: "{{ tmp_file.stdout }}"
      disk_format: raw
+     tags: "{{ image_tags }}"
   register: image
 
-- debug: var=image
+- name: Get details of created image
+  openstack.cloud.image_info:
+    cloud: "{{ cloud }}"
+    image: "{{ image_name }}"
+  register: image_info_result
+
+- name: Verify image info
+  assert:
+    that:
+      - "image_info_result.openstack_image.name == image_name"
+      - "image_info_result.openstack_image.tags | sort == image_tags | sort"
 
 - name: Delete raw image (defaults)
   openstack.cloud.image:
@@ -40,8 +51,6 @@
         distro: ubuntu
   register: image
 
-- debug: var=image
-
 - name: Delete raw image (complex)
   openstack.cloud.image:
      cloud: "{{ cloud }}"
@@ -52,3 +61,14 @@
   file:
      name: "{{ tmp_file.stdout }}"
      state: absent
+
+- name: Try to get details of deleted image
+  openstack.cloud.image_info:
+    cloud: "{{ cloud }}"
+    image: "{{ image_name }}"
+  register: deleted_image_info_result
+
+- name: Verify image is deleted
+  assert:
+    that:
+      - not deleted_image_info_result.openstack_image

ci/roles/keypair/tasks/main.yml

@@ -7,6 +7,17 @@
   register:
     keypair
 
+- name: Get list of keypairs
+  openstack.cloud.keypair_info:
+    cloud: "{{ cloud }}"
+    name: "{{ keypair_name }}"
+  register: keypairs
+
+- name: Ensure that list of keypairs contains single element
+  assert:
+    that:
+      - keypairs['openstack_keypairs']|length == 1
+
 # This assert verifies that Ansible is capable serializing data returned by SDK
 - name: Ensure private key is returned
   assert:
@@ -19,6 +30,17 @@
       name: "{{ keypair_name }}"
       state: absent
 
+- name: Get list of keypairs
+  openstack.cloud.keypair_info:
+    cloud: "{{ cloud }}"
+    name: "{{ keypair_name }}"
+  register: keypairs
+
+- name: Ensure that list of keypairs is empty
+  assert:
+    that:
+      - keypairs['openstack_keypairs']|length == 0
+
 - name: Generate test key file
   user:
       name: "{{ ansible_env.USER }}"
@@ -32,12 +54,34 @@
       state: present
       public_key_file: "{{ ansible_env.HOME }}/.ssh/shade_id_rsa.pub"
 
+- name: Get list of keypairs
+  openstack.cloud.keypair_info:
+    cloud: "{{ cloud }}"
+    name: "{{ keypair_name }}"
+  register: keypairs
+
+- name: Ensure that list of keypairs contains single element
+  assert:
+    that:
+      - keypairs['openstack_keypairs']|length == 1
+
 - name: Delete keypair (file)
   openstack.cloud.keypair:
       cloud: "{{ cloud }}"
       name: "{{ keypair_name }}"
       state: absent
 
+- name: Get list of keypairs
+  openstack.cloud.keypair_info:
+    cloud: "{{ cloud }}"
+    name: "{{ keypair_name }}"
+  register: keypairs
+
+- name: Ensure that list of keypairs is empty
+  assert:
+    that:
+      - keypairs['openstack_keypairs']|length == 0
+
 - name: Create keypair (key)
   openstack.cloud.keypair:
       cloud: "{{ cloud }}"
@@ -45,12 +89,34 @@
       state: present
       public_key: "{{ lookup('file', '~/.ssh/shade_id_rsa.pub') }}"
 
+- name: Get list of keypairs
+  openstack.cloud.keypair_info:
+    cloud: "{{ cloud }}"
+    name: "{{ keypair_name }}"
+  register: keypairs
+
+- name: Ensure that list of keypairs contains single element
+  assert:
+    that:
+      - keypairs['openstack_keypairs']|length == 1
+
 - name: Delete keypair (key)
   openstack.cloud.keypair:
       cloud: "{{ cloud }}"
       name: "{{ keypair_name }}"
       state: absent
 
+- name: Get list of keypairs
+  openstack.cloud.keypair_info:
+    cloud: "{{ cloud }}"
+    name: "{{ keypair_name }}"
+  register: keypairs
+
+- name: Ensure that list of keypairs is empty
+  assert:
+    that:
+      - keypairs['openstack_keypairs']|length == 0
+
 - name: Delete test key pub file
   file:
       name: "{{ ansible_env.HOME }}/.ssh/shade_id_rsa.pub"

ci/roles/keystone_domain/tasks/main.yml

@@ -1,19 +1,36 @@
 ---
 - name: Create keystone domain
   openstack.cloud.identity_domain:
-     cloud: "{{ cloud }}"
+    cloud: "{{ cloud }}"
-     state: present
+    state: present
-     name: "{{ domain_name }}"
+    name: "{{ domain_name }}"
-     description: "test description"
+    description: "test description"
+  register: os_domain
+
+- name: Test output
+  assert:
+    that:
+      - "'domain' in os_domain"
+      - os_domain.domain.name == "{{ domain_name }}"
+      - >-
+          ('enabled' in os_domain.domain.keys() and os_domain.domain['enabled']|bool) or
+          ('is_enabled' in os_domain.domain and os_domain.domain['is_enabled']|bool)
+      - os_domain.domain.description == "test description"
 
 - name: Update keystone domain
   openstack.cloud.identity_domain:
-     cloud: "{{ cloud }}"
+    cloud: "{{ cloud }}"
-     name: "{{ domain_name }}"
+    name: "{{ domain_name }}"
-     description: "updated description"
+    description: "updated description"
+  register: os_domain_updated
+
+- name: Test output
+  assert:
+    that:
+      - os_domain_updated.domain.description == "updated description"
 
 - name: Delete keystone domain
   openstack.cloud.identity_domain:
-     cloud: "{{ cloud }}"
+    cloud: "{{ cloud }}"
-     state: absent
+    state: absent
-     name: "{{ domain_name }}"
+    name: "{{ domain_name }}"

ci/roles/keystone_role/tasks/main.yml

@@ -5,6 +5,29 @@
      state: present
      name: "{{ role_name }}"
 
+- name: List keystone roles
+  openstack.cloud.identity_role_info:
+     cloud: "{{ cloud }}"
+  register: roles
+
+- name: Check roles
+  assert:
+    that:
+      - roles.openstack_roles | length > 0
+      - "'{{ role_name }}' in (roles.openstack_roles | map(attribute='name') | list)"
+
+- name: List keystone roles by name
+  openstack.cloud.identity_role_info:
+     cloud: "{{ cloud }}"
+     name: "{{ role_name}}"
+  register: roles1
+
+- name: Check roles
+  assert:
+    that:
+      - roles1.openstack_roles | length == 1
+      - roles1.openstack_roles[0]['name'] == role_name
+
 - name: Delete keystone role
   openstack.cloud.identity_role:
      cloud: "{{ cloud }}"

ci/roles/loadbalancer/defaults/main.yml

@@ -0,0 +1,3 @@
+network_name: network_lb
+subnet_name: subnet_lb
+lb_name: test_lb

ci/roles/loadbalancer/tasks/main.yml

@@ -0,0 +1,50 @@
+
+---
+- name: Create network {{ network_name }} for LB
+  openstack.cloud.network:
+    cloud: "{{ cloud }}"
+    name: "{{ network_name }}"
+    state: present
+
+- name: Create subnet {{ subnet_name }} on network {{ network_name }} for LB
+  openstack.cloud.subnet:
+    cloud: "{{ cloud }}"
+    network_name: "{{ network_name }}"
+    name: "{{ subnet_name }}"
+    state: present
+    enable_dhcp: true
+    dns_nameservers:
+      - 8.8.8.7
+      - 8.8.8.8
+    cidr: 192.168.0.0/24
+    gateway_ip: 192.168.0.1
+    allocation_pool_start: 192.168.0.2
+    allocation_pool_end: 192.168.0.254
+
+- name: Create loadbalancer - generic
+  openstack.cloud.loadbalancer:
+    cloud: "{{ cloud }}"
+    state: present
+    name: "{{ lb_name }}"
+    vip_subnet: "{{ subnet_name }}"
+    timeout: 450
+
+- name: Delete loadbalancer
+  openstack.cloud.loadbalancer:
+    cloud: "{{ cloud }}"
+    state: absent
+    name: "{{ lb_name }}"
+    timeout: 150
+
+- name: Delete subnet {{ subnet_name }} on network {{ network_name }}
+  openstack.cloud.subnet:
+    cloud: "{{ cloud }}"
+    network_name: "{{ network_name }}"
+    name: "{{ subnet_name }}"
+    state: absent
+
+- name: Delete network {{ network_name }} of LB
+  openstack.cloud.network:
+    cloud: "{{ cloud }}"
+    name: "{{ network_name }}"
+    state: absent

ci/roles/network/defaults/main.yml

@@ -1,3 +1,7 @@
 network_name: shade_network
+network_name_newparams: newparams_network
 network_shared: false
 network_external: false
+dns_domain: example.opendev.org
+mtu: 1250
+port_security_enabled: false

ci/roles/network/tasks/main.yml

@@ -1,5 +1,5 @@
 ---
-- name: Create network
+- name: Create network - generic
   openstack.cloud.network:
      cloud: "{{ cloud }}"
      name: "{{ network_name }}"
@@ -7,8 +7,71 @@
      shared: "{{ network_shared }}"
      external: "{{ network_external }}"
 
-- name: Delete network
+- name: Gather networks info - generic
-  openstack.cloud.network:
+  openstack.cloud.networks_info:
      cloud: "{{ cloud }}"
      name: "{{ network_name }}"
+     filters:
+       shared: "{{ network_shared|string|capitalize }}"
+  register: result
+
+- name: Verify networks info - generic
+  assert:
+    that:
+      - result.openstack_networks.0.name == network_name
+      - (result.openstack_networks.0.shared|lower) == (network_shared|lower)
+      - result.openstack_networks[0]['router:external'] == {{ network_external }}
+
+- name: Create network - with new SDK params
+  openstack.cloud.network:
+     cloud: "{{ cloud }}"
+     name: "{{ network_name_newparams }}"
+     state: present
+     shared: "{{ network_shared }}"
+     external: "{{ network_external }}"
+     mtu: "{{ mtu }}"
+     port_security_enabled: "{{ port_security_enabled }}"
+  register: result_create_nw_with_new_params
+  ignore_errors: yes
+
+- name: Check errors below min sdk version - with new SDK params
+  assert:
+    that:
+      - result_create_nw_with_new_params.failed
+      - '"the installed version of the openstacksdk library MUST be >=0.18.0." in result_create_nw_with_new_params.msg'
+  when: sdk_version is version('0.18', '<')
+
+- name: Gather networks info - with new SDK params
+  openstack.cloud.networks_info:
+     cloud: "{{ cloud }}"
+     name: "{{ network_name_newparams }}"
+  register: result_newparams
+  when: sdk_version is version('0.18', '>=')
+
+- name: Verify networks info - with new SDK params
+  assert:
+    that:
+      - result_newparams.openstack_networks.0.name == network_name_newparams
+      - result_newparams.openstack_networks.0.mtu == mtu
+      - result_newparams.openstack_networks.0.port_security_enabled == port_security_enabled
+  when: sdk_version is version('0.18', '>=')
+
+- name: Delete network - generic and with new SDK params
+  openstack.cloud.network:
+     cloud: "{{ cloud }}"
+     name: "{{ item }}"
      state: absent
+  with_items:
+      - "{{ network_name }}"
+      - "{{ network_name_newparams }}"
+
+- name: Gather networks info - deleted
+  openstack.cloud.networks_info:
+     cloud: "{{ cloud }}"
+     name: "{{ network_name }}"
+  register: result_nonet
+
+- name: Verify networks info - deleted
+  assert:
+    that:
+      - result_nonet.openstack_networks == []

ci/roles/neutron_rbac/tasks/main.yml

@@ -0,0 +1,85 @@
+---
+# General run of tests
+# - Prepare projects/network objects
+# - Create rbac object
+# - Get rbac object info
+# - Verify RBAC object match
+# - Delete rbac object
+# - Get rbac object info
+# - Verify RBAC object deleted
+
+- name: Create source project
+  openstack.cloud.project:
+     cloud: "{{ cloud }}"
+     state: present
+     name: source_project
+     description: Source project for network RBAC test
+     domain_id: default
+     enabled: True
+  register: source_project
+
+- name: Create network - generic
+  openstack.cloud.network:
+     cloud: "{{ cloud }}"
+     name: "{{ network_name }}"
+     state: present
+     project: "{{ source_project.project.id }}"
+     shared: false
+     external: "{{ network_external }}"
+  register: network
+
+- name: Create target project
+  openstack.cloud.project:
+     cloud: "{{ cloud }}"
+     state: present
+     name: ansible_project
+     description: Target project for network RBAC test
+     domain_id: default
+     enabled: True
+  register: target_project
+
+- name: Create a new network RBAC policy
+  openstack.cloud.neutron_rbac_policy:
+    cloud: "{{ cloud }}"
+    object_id: "{{ network.network.id }}"
+    object_type: 'network'
+    action: 'access_as_shared'
+    target_project_id: "{{ target_project.project.id }}"
+    project_id: "{{ source_project.project.id }}"
+  register: rbac_policy
+
+- name: Get all rbac policies for {{ source_project.project.name }} - after creation
+  openstack.cloud.neutron_rbac_policies_info:
+    cloud: "{{ cloud }}"
+    project_id: "{{ source_project.project.id }}"
+  register: rbac_policies
+
+- name: Capture all existing policy IDs
+  set_fact:
+    rbac_policy_ids: "{{ rbac_policies.policies | map(attribute='id') | list }}"
+
+- name: Verify policy exists - after creation
+  assert:
+    that:
+      - rbac_policy.policy.id in rbac_policy_ids
+
+- name: Delete RBAC policy
+  openstack.cloud.neutron_rbac_policy:
+    cloud: "{{ cloud }}"
+    policy_id: "{{ rbac_policy.policy.id }}"
+    state: absent
+
+- name: Get all rbac policies for {{ source_project.project.name }} - after deletion
+  openstack.cloud.neutron_rbac_policies_info:
+    cloud: "{{ cloud }}"
+    project_id: "{{ source_project.project.id }}"
+  register: rbac_policies_remaining
+
+- name: Capture all remaining policy IDs
+  set_fact:
+    remaining_rbac_policy_ids: "{{ rbac_policies_remaining.policies | map(attribute='id') | list }}"
+
+- name: Verify policy does not exist - after deletion
+  assert:
+    that:
+      - not rbac_policy.policy.id in remaining_rbac_policy_ids

ci/roles/nova_services/tasks/main.yml

@@ -0,0 +1,15 @@
+---
+
+- name: Get nova compute services info
+  openstack.cloud.compute_service_info:
+    cloud: "{{ cloud }}"
+    binary: "nova-compute"
+  register: result
+  failed_when: "result.openstack_compute_services | length <= 0"
+
+- name: Get nova conductor services info
+  openstack.cloud.compute_service_info:
+    cloud: "{{ cloud }}"
+    binary: "nova-conductor"
+  register: result
+  failed_when: "result.openstack_compute_services | length <= 0"

ci/roles/object_container/defaults/main.yml

@@ -0,0 +1 @@
+container_name: "test-container"

ci/roles/object_container/tasks/main.yml

@@ -0,0 +1,60 @@
+---
+- module_defaults:
+    openstack.cloud.object_container:
+      cloud: "{{ cloud }}"
+  block:
+    - name: Create an empty container
+      openstack.cloud.object_container:
+        container: "{{ container_name }}"
+      register: container
+
+    - name: Verify container was created
+      assert:
+        that:
+          - container is success
+          - container is changed
+          - container.container.name == container_name
+
+    - name: Set metadata for a container
+      openstack.cloud.object_container:
+        container: "{{ container_name }}"
+        metadata: "Cache-Control='no-cache'"
+      register: set_meta
+
+    - name: Verify container metadata was set
+      assert:
+        that:
+          - set_meta is success
+          - set_meta is changed
+
+    - name: Delete some keys from container metadata
+      openstack.cloud.object_container:
+        container: "{{ container_name }}"
+        keys:
+            - Cache-Control
+      register: delete_meta
+
+    - name: Verify some keys from container metadata was deleted
+      assert:
+        that:
+          - delete_meta is success
+          - delete_meta is changed
+
+    - name: Delete container
+      openstack.cloud.object_container:
+        container: "{{ container_name }}"
+        state: absent
+      register: deleted
+
+    - name: Verify container was deleted
+      assert:
+        that:
+          - deleted is success
+          - deleted is changed
+
+  always:
+    - name: Delete container
+      openstack.cloud.object_container:
+        container: "{{ container_name }}"
+        state: absent
+      ignore_errors: yes

ci/roles/orchestration/defaults/main.yaml

@@ -0,0 +1,2 @@
+---
+stack_name: "test-stack"

ci/roles/orchestration/files/hello-world.yaml

@@ -0,0 +1,11 @@
+#
+# Minimal HOT template defining a single compute server.
+#
+heat_template_version: 2013-05-23
+
+description: >
+  Minimal HOT template for stack
+
+parameters:
+resources:
+outputs:

ci/roles/orchestration/tasks/main.yaml

@@ -0,0 +1,44 @@
+---
+- name: Create minimal stack
+  openstack.cloud.stack:
+    cloud: "{{ cloud }}"
+    # template is searched related to playbook location or as absolute path
+    template: "roles/orchestration/files/hello-world.yaml"
+    name: "{{ stack_name }}"
+
+- name: List stacks
+  openstack.cloud.stack_info:
+    cloud: "{{ cloud }}"
+  register: stacks
+
+- assert:
+    that:
+      - stacks['stacks']|length > 0
+
+- name: Get Single stack
+  openstack.cloud.stack_info:
+    cloud: "{{ cloud }}"
+    name: "{{ stack_name }}"
+  register: test_stack
+
+- assert:
+    that:
+      - test_stack is defined
+      - test_stack['stacks'][0]['name'] == stack_name
+
+- name: Delete stack
+  openstack.cloud.stack:
+    cloud: "{{ cloud }}"
+    name: "{{ stack_name }}"
+    state: absent
+
+- name: Get Single stack
+  openstack.cloud.stack_info:
+    cloud: "{{ cloud }}"
+    name: "{{ stack_name }}"
+  register: stacks
+
+- assert:
+    that:
+      - stacks is defined
+      - stacks['stacks']|length == 0

ci/roles/port/defaults/main.yml

@@ -4,3 +4,6 @@ subnet_name: ansible_port_subnet
 port_name: ansible_port
 secgroup_name: ansible_port_secgroup
 no_security_groups: True
+binding_profile:
+  "pci_slot": "0000:03:11.1"
+  "physical_network": "provider"

ci/roles/port/tasks/main.yml

@@ -60,6 +60,26 @@
      state: absent
      name: "{{ port_name }}"
 
+- name: Create port (with dns_name, dns_domain)
+  openstack.cloud.port:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ port_name }}"
+     network: "{{ network_name }}"
+     fixed_ips:
+       - ip_address: 10.5.5.69
+     dns_name: "dns-port-name"
+     dns_domain: "example.com."
+  register: port
+
+- debug: var=port
+
+- name: Delete port (with dns name,domain)
+  openstack.cloud.port:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: "{{ port_name }}"
+
 - name: Create port (with allowed_address_pairs and extra_dhcp_opts)
   openstack.cloud.port:
      cloud: "{{ cloud }}"
@@ -88,6 +108,30 @@
      state: absent
      name: "{{ secgroup_name }}"
 
+- name: Test port binding config (runs from train release sdk > 0.28)
+  block:
+    - name: Create port (with binding profile)
+      openstack.cloud.port:
+        cloud: "{{ cloud }}"
+        state: present
+        name: "{{ port_name }}"
+        network: "{{ network_name }}"
+        binding_profile: "{{ binding_profile }}"
+      register: port
+
+    - name: Assert binding:profile exists in created port
+      assert:
+        that: "port.port['binding_profile']"
+
+    - debug: var=port
+
+    - name: Delete port (with binding profile)
+      openstack.cloud.port:
+        cloud: "{{ cloud }}"
+        state: absent
+        name: "{{ port_name }}"
+  when: sdk_version is version(0.28, '>')
+
 - name: Delete subnet
   openstack.cloud.subnet:
      cloud: "{{ cloud }}"

ci/roles/project_properties/defaults/main.yml

@@ -1,2 +0,0 @@
-dummy_value: 'test-value'
-dummy_value_updated: 'test-value-updated'

ci/roles/project_properties/tasks/main.yml

@@ -1,142 +0,0 @@
----
-- name: 'Create project with properties - CHECK_MODE'
-  check_mode: yes
-  openstack.cloud.project:
-     cloud: "{{ cloud }}"
-     state: present
-     name: ansible_project
-     description: dummy description
-     domain_id: default
-     enabled: True
-     properties:
-       dummy_key: '{{ dummy_value }}'
-  register: create_project_cm
-- assert:
-    that:
-      - create_project_cm is successful
-      - create_project_cm is changed
-
-- name: 'Create project with properties'
-  openstack.cloud.project:
-    cloud: "{{ cloud }}"
-    state: present
-    name: ansible_project
-    description: dummy description
-    domain_id: default
-    enabled: True
-    properties:
-      dummy_key: '{{ dummy_value }}'
-  register: create_project
-- assert:
-    that:
-    - create_project is successful
-    - create_project is changed
-    - '"project" in create_project'
-    - '"dummy_key" in create_project["project"]'
-    - create_project["project"].dummy_key == dummy_value
-
-- name: 'Create project with properties (retry - no change) - CHECK_MODE'
-  check_mode: yes
-  openstack.cloud.project:
-    cloud: "{{ cloud }}"
-    state: present
-    name: ansible_project
-    description: dummy description
-    domain_id: default
-    enabled: True
-    properties:
-      dummy_key: '{{ dummy_value }}'
-  register: create_project_retry_cm
-- assert:
-    that:
-      - create_project_retry_cm is successful
-      - create_project_retry_cm is not changed
-
-- name: 'Create project with properties (retry - no change)'
-  openstack.cloud.project:
-    cloud: "{{ cloud }}"
-    state: present
-    name: ansible_project
-    description: dummy description
-    domain_id: default
-    enabled: True
-    properties:
-      dummy_key: '{{ dummy_value }}'
-  register: create_project_retry
-- assert:
-    that:
-    - create_project_retry is successful
-    - create_project_retry is not changed
-    - '"project" in create_project_retry'
-    - '"dummy_key" in create_project_retry["project"]'
-    - create_project_retry["project"].dummy_key == dummy_value
-
-- name: 'Update project with properties - CHECK_MODE'
-  check_mode: yes
-  openstack.cloud.project:
-     cloud: "{{ cloud }}"
-     state: present
-     name: ansible_project
-     description: new description
-     properties:
-       dummy_key: '{{ dummy_value_updated }}'
-  register: updated_project_cm
-- assert:
-    that:
-      - updated_project_cm is successful
-      - updated_project_cm is changed
-
-- name: 'Update project with properties'
-  openstack.cloud.project:
-    cloud: "{{ cloud }}"
-    state: present
-    name: ansible_project
-    description: new description
-    properties:
-      dummy_key: '{{ dummy_value_updated }}'
-  register: updated_project
-- assert:
-    that:
-    - updated_project is successful
-    - updated_project is changed
-    - '"project" in updated_project'
-    - '"dummy_key" in updated_project["project"]'
-    - updated_project["project"].dummy_key == dummy_value_updated
-
-- name: 'Update project with properties (retry - no change) - CHECK_MODE'
-  check_mode: yes
-  openstack.cloud.project:
-    cloud: "{{ cloud }}"
-    state: present
-    name: ansible_project
-    description: new description
-    properties:
-      dummy_key: '{{ dummy_value_updated }}'
-  register: updated_project_retry_cm
-- assert:
-    that:
-      - updated_project_retry_cm is successful
-      - updated_project_retry_cm is not changed
-
-- name: 'Update project with properties (retry - no change)'
-  openstack.cloud.project:
-    cloud: "{{ cloud }}"
-    state: present
-    name: ansible_project
-    description: new description
-    properties:
-      dummy_key: '{{ dummy_value_updated }}'
-  register: updated_project_retry
-- assert:
-    that:
-    - updated_project_retry is successful
-    - updated_project_retry is not changed
-    - '"project" in updated_project_retry'
-    - '"dummy_key" in updated_project_retry["project"]'
-    - updated_project_retry["project"].dummy_key == dummy_value_updated
-
-- name: Delete project with properties
-  openstack.cloud.project:
-     cloud: "{{ cloud }}"
-     state: absent
-     name: ansible_project

ci/roles/router/tasks/main.yml

@@ -15,6 +15,30 @@
      name: shade_subnet1
      cidr: 10.7.7.0/24
 
+- name: Create subnet2
+  openstack.cloud.subnet:
+     cloud: "{{ cloud }}"
+     state: present
+     network_name: "{{ network_name }}"
+     name: shade_subnet2
+     cidr: 10.8.8.0/24
+
+- name: Create subnet3
+  openstack.cloud.subnet:
+     cloud: "{{ cloud }}"
+     state: present
+     network_name: "{{ network_name }}"
+     name: shade_subnet3
+     cidr: 10.9.9.0/24
+
+- name: Create subnet4
+  openstack.cloud.subnet:
+     cloud: "{{ cloud }}"
+     state: present
+     network_name: "{{ network_name }}"
+     name: shade_subnet4
+     cidr: 10.10.10.0/24
+
 - name: Create router
   openstack.cloud.router:
      cloud: "{{ cloud }}"
@@ -29,6 +53,19 @@
      interfaces:
          - shade_subnet1
 
+- name: Update router (add interface) again
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ router_name }}"
+     interfaces:
+         - shade_subnet1
+  register: result
+
+- name: Assert idempotent module
+  assert:
+    that: result is not changed
+
 - name: Gather routers info
   openstack.cloud.routers_info:
      cloud: "{{ cloud }}"
@@ -43,6 +80,93 @@
       - "result.openstack_routers.0.name == router_name"
       - (result.openstack_routers.0.interfaces_info|length) == 1
 
+- name: Update router (change interfaces)
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ router_name }}"
+     interfaces:
+         - net: '{{ network_name }}'
+           subnet: shade_subnet2
+           portip: 10.8.8.1
+         - net: '{{ network_name }}'
+           subnet: shade_subnet3
+         - shade_subnet4
+
+- name: Update router (change interfaces) again
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ router_name }}"
+     interfaces:
+         - net: '{{ network_name }}'
+           subnet: shade_subnet2
+           portip: 10.8.8.1
+         - net: '{{ network_name }}'
+           subnet: shade_subnet3
+         - shade_subnet4
+  register: result
+
+- name: Assert idempotent module
+  assert:
+    that: result is not changed
+
+- name: Gather routers info
+  openstack.cloud.routers_info:
+     cloud: "{{ cloud }}"
+     name: "{{ router_name }}"
+     filters:
+       admin_state_up: true
+  register: result
+
+- name: Verify routers info
+  assert:
+    that:
+      - "result.openstack_routers.0.name == router_name"
+      - (result.openstack_routers.0.interfaces_info|length) == 3
+      - result.openstack_routers.0.interfaces_info|map(attribute='ip_address')|sort|list ==
+        ['10.10.10.1', '10.8.8.1', '10.9.9.1']
+
+- name: Update router (remove interface)
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ router_name }}"
+     interfaces:
+         - net: '{{ network_name }}'
+           subnet: shade_subnet1
+           portip: 10.7.7.1
+
+- name: Update router (remove interface) again
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ router_name }}"
+     interfaces:
+         - net: '{{ network_name }}'
+           subnet: shade_subnet1
+           portip: 10.7.7.1
+  register: result
+
+- name: Assert idempotent module
+  assert:
+    that: result is not changed
+
+- name: Gather routers info
+  openstack.cloud.routers_info:
+     cloud: "{{ cloud }}"
+     name: "{{ router_name }}"
+     filters:
+       admin_state_up: true
+  register: result
+
+- name: Verify routers info
+  assert:
+    that:
+      - "result.openstack_routers.0.name == router_name"
+      - (result.openstack_routers.0.interfaces_info|length) == 1
+      - result.openstack_routers.0.interfaces_info.0.ip_address == '10.7.7.1'
+
 # Admin operation
 - name: Create external network
   openstack.cloud.network:
@@ -53,12 +177,12 @@
   when:
     - network_external
 
-- name: Create subnet2
+- name: Create subnet5
   openstack.cloud.subnet:
      cloud: "{{ cloud }}"
      state: present
      network_name: "{{ external_network_name }}"
-     name: shade_subnet2
+     name: shade_subnet5
      cidr: 10.6.6.0/24
   when:
     - network_external
@@ -88,6 +212,142 @@
       - "result.openstack_routers.0.name == router_name"
       - (result.openstack_routers.0.interfaces_info|length) == 1
 
+- name: Update router (change external fixed ips)
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ router_name }}"
+     interfaces:
+         - shade_subnet1
+     network: "{{ external_network_name }}"
+     external_fixed_ips:
+        - subnet: shade_subnet5
+          ip: 10.6.6.100
+  when:
+    - network_external
+
+- name: Gather routers info
+  openstack.cloud.routers_info:
+     cloud: "{{ cloud }}"
+     name: "{{ router_name }}"
+     filters:
+       admin_state_up: true
+  register: result
+
+- name: Verify routers info
+  assert:
+    that:
+      - "result.openstack_routers.0.name == router_name"
+      - (result.openstack_routers.0.external_gateway_info.external_fixed_ips|length) == 1
+      - result.openstack_routers.0.external_gateway_info.external_fixed_ips.0.ip_address == "10.6.6.100"
+  when:
+    - network_external
+
+- name: Update router (add external fixed ips)
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ router_name }}"
+     interfaces:
+         - shade_subnet1
+     network: "{{ external_network_name }}"
+     external_fixed_ips:
+        - subnet: shade_subnet5
+          ip: 10.6.6.100
+        - subnet: shade_subnet5
+          ip: 10.6.6.101
+  when:
+    - network_external
+
+- name: Update router (add external fixed ips) again
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ router_name }}"
+     interfaces:
+         - shade_subnet1
+     network: "{{ external_network_name }}"
+     external_fixed_ips:
+        - subnet: shade_subnet5
+          ip: 10.6.6.100
+        - subnet: shade_subnet5
+          ip: 10.6.6.101
+  when:
+    - network_external
+  register: result
+
+- name: Assert idempotent module
+  assert:
+    that: result is not changed
+
+- name: Gather routers info
+  openstack.cloud.routers_info:
+     cloud: "{{ cloud }}"
+     name: "{{ router_name }}"
+     filters:
+       admin_state_up: true
+  register: result
+
+- name: Verify routers info
+  assert:
+    that:
+      - "result.openstack_routers.0.name == router_name"
+      - (result.openstack_routers.0.external_gateway_info.external_fixed_ips|length) == 2
+      - result.openstack_routers.0.external_gateway_info.external_fixed_ips|map(attribute='ip_address')|sort|list ==
+        ["10.6.6.100", "10.6.6.101"]
+  when:
+    - network_external
+
+- name: Update router (remove external fixed ips)
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ router_name }}"
+     interfaces:
+         - shade_subnet1
+     network: "{{ external_network_name }}"
+     external_fixed_ips:
+        - subnet: shade_subnet5
+          ip: 10.6.6.101
+  when:
+    - network_external
+
+- name: Update router (remove external fixed ips) again
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ router_name }}"
+     interfaces:
+         - shade_subnet1
+     network: "{{ external_network_name }}"
+     external_fixed_ips:
+        - subnet: shade_subnet5
+          ip: 10.6.6.101
+  when:
+    - network_external
+  register: result
+
+- name: Assert idempotent module
+  assert:
+    that: result is not changed
+
+- name: Gather routers info
+  openstack.cloud.routers_info:
+     cloud: "{{ cloud }}"
+     name: "{{ router_name }}"
+     filters:
+       admin_state_up: true
+  register: result
+
+- name: Verify routers info
+  assert:
+    that:
+      - "result.openstack_routers.0.name == router_name"
+      - (result.openstack_routers.0.external_gateway_info.external_fixed_ips|length) == 1
+      - result.openstack_routers.0.external_gateway_info.external_fixed_ips.0.ip_address == "10.6.6.101"
+  when:
+    - network_external
+
 - name: Delete router
   openstack.cloud.router:
      cloud: "{{ cloud }}"
@@ -105,6 +365,24 @@
      cloud: "{{ cloud }}"
      state: absent
      name: shade_subnet2
+
+- name: Delete subnet3
+  openstack.cloud.subnet:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: shade_subnet3
+
+- name: Delete subnet4
+  openstack.cloud.subnet:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: shade_subnet4
+
+- name: Delete subnet5
+  openstack.cloud.subnet:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: shade_subnet5
   when:
     - network_external
 

ci/roles/security_group/tasks/main.yml

@@ -32,6 +32,26 @@
      protocol: tcp
      remote_ip_prefix: 0.0.0.0/0
 
+- name: Create TCP rule again with port range (1, 65535)
+  openstack.cloud.security_group_rule:
+     cloud: "{{ cloud }}"
+     security_group: "{{ secgroup_name }}"
+     state: present
+     protocol: tcp
+     port_range_min: 1
+     port_range_max: 65535
+     remote_ip_prefix: 0.0.0.0/0
+
+- name: Create TCP rule again with port range (-1, -1)
+  openstack.cloud.security_group_rule:
+     cloud: "{{ cloud }}"
+     security_group: "{{ secgroup_name }}"
+     state: present
+     protocol: tcp
+     port_range_min: -1
+     port_range_max: -1
+     remote_ip_prefix: 0.0.0.0/0
+
 - name: Create empty UDP rule
   openstack.cloud.security_group_rule:
      cloud: "{{ cloud }}"
@@ -40,6 +60,26 @@
      protocol: udp
      remote_ip_prefix: 0.0.0.0/0
 
+- name: Create UDP rule again with port range (1, 65535)
+  openstack.cloud.security_group_rule:
+     cloud: "{{ cloud }}"
+     security_group: "{{ secgroup_name }}"
+     state: present
+     protocol: udp
+     port_range_min: 1
+     port_range_max: 65535
+     remote_ip_prefix: 0.0.0.0/0
+
+- name: Create UDP rule again with port range (-1, -1)
+  openstack.cloud.security_group_rule:
+     cloud: "{{ cloud }}"
+     security_group: "{{ secgroup_name }}"
+     state: present
+     protocol: udp
+     port_range_min: -1
+     port_range_max: -1
+     remote_ip_prefix: 0.0.0.0/0
+
 - name: Create HTTP rule
   openstack.cloud.security_group_rule:
      cloud: "{{ cloud }}"
@@ -61,6 +101,71 @@
      remote_ip_prefix: 0.0.0.0/0
      direction: egress
 
+- name: List all available rules of all security groups in a project
+  openstack.cloud.security_group_rule_info:
+     cloud: "{{ cloud }}"
+  when: sdk_version is version("0.32", '>=')
+  register: test_sec_rules
+
+- name: Check - List all available rules of all security groups in a project
+  assert:
+    that:
+      - test_sec_rules.security_group_rules | length > 0
+  when: sdk_version is version("0.32", '>=')
+
+- name: List all available rules of a specific security group
+  openstack.cloud.security_group_rule_info:
+     cloud: "{{ cloud }}"
+     security_group: "{{ secgroup_name }}"
+  register: test_sec_rule1
+
+- name: Check - List all available rules of a specific security group
+  assert:
+    that:
+      - test_sec_rule1.security_group_rules | length > 0
+
+- name: List all available rules with filters
+  openstack.cloud.security_group_rule_info:
+     cloud: "{{ cloud }}"
+     security_group: "{{ secgroup_name }}"
+     protocol: tcp
+     port_range_min: 80
+     port_range_max: 80
+     remote_ip_prefix: 0.0.0.0/0
+  when: sdk_version is version("0.32", '>=')
+  register: test_sec_rule
+
+- name: Check - List all available rules with filters
+  assert:
+    that:
+      - test_sec_rule.security_group_rules | length == 1
+  when: sdk_version is version("0.32", '>=')
+
+- name: List all security groups of a project
+  openstack.cloud.security_group_info:
+     cloud: "{{ cloud }}"
+  register: test_sec_groups
+
+- name: Check - List all security groups of a project
+  assert:
+    that:
+      - test_sec_groups.security_groups | length > 0
+
+- name: Filter security group by name
+  openstack.cloud.security_group_info:
+     cloud: "{{ cloud }}"
+     name: "{{ secgroup_name }}"
+  register: test_sec_group
+
+- name: Check - List all security groups of a project
+  assert:
+    that:
+      - test_sec_group.security_groups | length  == 1
+      - test_sec_group.security_groups[0]['name'] == secgroup_name
+  # This fails on Stein only
+  when: sdk_version is version("0.36.5", '>=')
+
+
 - name: Delete empty ICMP rule
   openstack.cloud.security_group_rule:
      cloud: "{{ cloud }}"

ci/roles/server/tasks/main.yml

@@ -14,6 +14,16 @@
 
 - debug: var=server
 
+- name: Get info about all servers
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+  register: info
+
+- name: Check info about servers
+  assert:
+    that:
+      info.openstack_servers|length > 0
+
 - name: Delete server with meta as CSV
   openstack.cloud.server:
      cloud: "{{ cloud }}"
@@ -21,6 +31,16 @@
      name: "{{ server_name }}"
      wait: true
 
+- name: Get info about all servers
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+  register: info
+
+- name: Check info about no servers
+  assert:
+    that:
+      info.openstack_servers|length == 0
+
 - name: Create server with meta as dict
   openstack.cloud.server:
      cloud: "{{ cloud }}"
@@ -38,6 +58,17 @@
 
 - debug: var=server
 
+- name: Get info about one server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info
+
+- name: Check info about server name
+  assert:
+    that:
+      info.openstack_servers[0].name == "{{ server_name }}"
+
 - name: Delete server with meta as dict
   openstack.cloud.server:
      cloud: "{{ cloud }}"
@@ -60,6 +91,18 @@
 
 - debug: var=server
 
+- name: Get detailed info about one server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    detailed: true
+  register: info
+
+- name: Check info about server image name
+  assert:
+    that:
+      info.openstack_servers[0].image.name == "{{ image }}"
+
 - name: Delete server (FIP from pool/network)
   openstack.cloud.server:
      cloud: "{{ cloud }}"
@@ -81,8 +124,12 @@
      terminate_volume: true
      wait: true
   register: server
+  tags:
+    - object
 
 - debug: var=server
+  tags:
+    - object
 
 - name: Delete server with volume
   openstack.cloud.server:
@@ -90,3 +137,51 @@
      state: absent
      name: "{{ server_name }}"
      wait: true
+  tags:
+    - object
+
+- name: Create a minimal server
+  openstack.cloud.server:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ server_name }}"
+     image: "{{ image }}"
+     flavor: "{{ flavor }}"
+     network: "{{ server_network }}"
+     auto_floating_ip: false
+     wait: true
+  register: server
+
+- debug: var=server
+
+- name: Get info about servers in all projects
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    all_projects: true
+  register: info
+
+- name: Check info about servers in all projects
+  assert:
+    that:
+      info.openstack_servers|length > 0
+
+- name: Get info about one server in all projects
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    all_projects: true
+  register: info
+
+- name: Check info about one server in all projects
+  assert:
+    that:
+      info.openstack_servers|length > 0
+
+- name: Delete minimal server
+  openstack.cloud.server:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: "{{ server_name }}"
+     wait: true
+
+- include_tasks: server_actions.yml

ci/roles/server/tasks/server_actions.yml

@@ -0,0 +1,520 @@
+- name: Create server
+  openstack.cloud.server:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ server_name }}"
+     image: "{{ image }}"
+     flavor: "{{ flavor }}"
+     network: "{{ server_network }}"
+     auto_floating_ip: false
+     wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info1
+
+- name: Ensure status for server is ACTIVE
+  assert:
+    that:
+      - info1.openstack_servers.0.status == 'ACTIVE'
+
+- name: Stop server
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: stop
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info2
+
+- name: Ensure status for server is SHUTOFF
+  assert:
+    that:
+      - info2.openstack_servers.0.status == 'SHUTOFF'
+      - server is changed
+
+- name: Stop server again
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: stop
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info3
+
+- name: Ensure status for server is SHUTOFF
+  assert:
+    that:
+      - info3.openstack_servers.0.status == 'SHUTOFF'
+      - server is not changed
+
+- name: Start server
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: start
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info4
+
+- name: Ensure status for server is ACTIVE
+  assert:
+    that:
+      - info4.openstack_servers.0.status == 'ACTIVE'
+      - server is changed
+
+- name: Start server again
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: start
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info5
+
+- name: Ensure status for server is ACTIVE
+  assert:
+    that:
+      - info5.openstack_servers.0.status == 'ACTIVE'
+      - server is not changed
+
+- name: Pause server
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: pause
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info6
+
+- name: Ensure status for server is PAUSED
+  assert:
+    that:
+      - info6.openstack_servers.0.status == 'PAUSED'
+      - server is changed
+
+- name: Pause server again
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: pause
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info7
+
+- name: Ensure status for server is PAUSED
+  assert:
+    that:
+      - info7.openstack_servers.0.status == 'PAUSED'
+      - server is not changed
+
+- name: Unpause server
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: unpause
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info8
+
+- name: Ensure status for server is ACTIVE
+  assert:
+    that:
+      - info8.openstack_servers.0.status == 'ACTIVE'
+      - server is changed
+
+- name: Unpause server again
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: unpause
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info9
+
+- name: Ensure status for server is ACTIVE
+  assert:
+    that:
+      - info9.openstack_servers.0.status == 'ACTIVE'
+      - server is not changed
+
+- name: Lock server
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: lock
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info10
+
+- name: Ensure status for server is ACTIVE
+  assert:
+    that:
+      - info10.openstack_servers.0.status == 'ACTIVE'
+      # not in all versions 'locked' is supported
+      - >-
+        (info10.openstack_server[0]['locked'] is defined and
+         info10.openstack_server[0]['locked']|bool) or
+        (info10.openstack_server[0]['locked'] is not defined)
+      - server is changed
+
+- name: Lock server again
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: lock
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info11
+
+- name: Ensure status for server is ACTIVE
+  assert:
+    that:
+      - info11.openstack_servers.0.status == 'ACTIVE'
+      # not in all versions 'locked' is supported
+      - >-
+        (info11.openstack_server[0]['locked'] is defined and
+         info11.openstack_server[0]['locked']|bool) or
+        (info11.openstack_server[0]['locked'] is not defined)
+      - server is changed  # no support for lock idempotency
+
+- name: Unock server
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: unlock
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info12
+
+- name: Ensure status for server is ACTIVE
+  assert:
+    that:
+      - info12.openstack_servers.0.status == 'ACTIVE'
+      # not in all versions 'locked' is supported
+      - >-
+        (info12.openstack_server[0]['locked'] is defined and
+         not info12.openstack_server[0]['locked']|bool) or
+        (info12.openstack_server[0]['locked'] is not defined)
+      - server is changed
+
+- name: Unlock server again
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: unlock
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info13
+
+- name: Ensure status for server is ACTIVE
+  assert:
+    that:
+      - info13.openstack_servers.0.status == 'ACTIVE'
+      - server is changed  # no support for unlock idempotency
+      # not in all versions 'locked' is supported
+      - >-
+        (info13.openstack_server[0]['locked'] is defined and
+         not info13.openstack_server[0]['locked']|bool) or
+        (info13.openstack_server[0]['locked'] is not defined)
+
+- name: Suspend server
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: suspend
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info14
+
+- name: Ensure status for server is SUSPENDED
+  assert:
+    that:
+      - info14.openstack_servers.0.status == 'SUSPENDED'
+      - server is changed
+
+- name: Suspend server again
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: suspend
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info15
+
+- name: Ensure status for server is SUSPENDED
+  assert:
+    that:
+      - info15.openstack_servers.0.status == 'SUSPENDED'
+      - server is not changed
+
+- name: Resume server
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: resume
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info16
+
+- name: Ensure status for server is ACTIVE
+  assert:
+    that:
+      - info16.openstack_servers.0.status == 'ACTIVE'
+      - server is changed
+
+- name: Resume server again
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: resume
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info17
+
+- name: Ensure status for server is ACTIVE
+  assert:
+    that:
+      - info17.openstack_servers.0.status == 'ACTIVE'
+      - server is not changed
+
+- name: Rebuild server - error
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: rebuild
+    wait: true
+  register: server
+  ignore_errors: true
+
+- name: Ensure server rebuild failed
+  assert:
+    that:
+      - server is failed
+      - "'missing: image' in server.msg "
+
+- name: Rebuild server
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    image: "{{ image }}"
+    action: rebuild
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info18
+
+- name: Ensure status for server is ACTIVE
+  assert:
+    that:
+      - info18.openstack_servers.0.status in ('ACTIVE', 'REBUILD')
+      - server is changed
+
+- name: Rebuild server with admin password
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    image: "{{ image }}"
+    action: rebuild
+    wait: true
+    admin_password: random
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info19
+
+- name: Ensure status for server is ACTIVE
+  assert:
+    that:
+      - info19.openstack_servers.0.status in ('ACTIVE', 'REBUILD')
+      - server is changed
+
+- name: Shelve server
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: shelve
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info20
+
+- name: Ensure status for server is SHELVED or SHELVED_OFFLOADED
+  assert:
+    that:
+      - info20.openstack_servers.0.status in ['SHELVED', 'SHELVED_OFFLOADED']
+      - server is changed
+
+- name: Shelve offload server
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: shelve_offload
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info21
+
+- name: Ensure status for server is SHELVED_OFFLOADED
+  # no change if server has been offloaded automatically after first shelve command
+  assert:
+    that:
+      - info21.openstack_servers.0.status == 'SHELVED_OFFLOADED'
+
+- name: Shelve offload server again
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: shelve_offload
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info22
+
+- name: Ensure status for server is SHELVED_OFFLOADED
+  assert:
+    that:
+      - info22.openstack_servers.0.status == 'SHELVED_OFFLOADED'
+      - server is not changed
+
+- name: Unshelve server
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: unshelve
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info23
+
+- name: Ensure status for server is ACTIVE
+  assert:
+    that:
+      - info23.openstack_servers.0.status == 'ACTIVE'
+      - server is changed
+
+- name: Unshelve server again
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: unshelve
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info24
+
+- name: Ensure status for server is ACTIVE
+  assert:
+    that:
+      - info24.openstack_servers.0.status == 'ACTIVE'
+      - server is not changed

ci/roles/subnet/tasks/subnet-allocation.yml

@@ -17,6 +17,19 @@
     allocation_pool_start: 192.168.0.2
     allocation_pool_end: 192.168.0.4
 
+- name: Create subnet {{ subnet_name }} on network {{ network_name }} again
+  openstack.cloud.subnet:
+    cloud: "{{ cloud }}"
+    network_name: "{{ network_name }}"
+    enable_dhcp: "{{ enable_subnet_dhcp }}"
+    name: "{{ subnet_name }}"
+    state: present
+    cidr: 192.168.0.0/24
+    gateway_ip: 192.168.0.1
+    allocation_pool_start: 192.168.0.2
+    allocation_pool_end: 192.168.0.4
+  register: idem1
+
 - name: Update subnet {{ subnet_name }} allocation pools
   openstack.cloud.subnet:
     cloud: "{{ cloud }}"
@@ -24,7 +37,8 @@
     name: "{{ subnet_name }}"
     state: present
     cidr: 192.168.0.0/24
-    allocation_pool_start: 192.168.0.5
+    gateway_ip: 192.168.0.1
+    allocation_pool_start: 192.168.0.2
     allocation_pool_end: 192.168.0.8
 
 - name: Get Subnet Info
@@ -36,19 +50,17 @@
 - name: Verify Subnet Allocation Pools Exist
   assert:
     that:
+      - idem1 is not changed
       - subnet_result.openstack_subnets is defined
       - subnet_result.openstack_subnets | length == 1
       - subnet_result.openstack_subnets[0].allocation_pools is defined
-      - subnet_result.openstack_subnets[0].allocation_pools | length == 2
+      - subnet_result.openstack_subnets[0].allocation_pools | length == 1
 
 - name: Verify Subnet Allocation Pools
   assert:
     that:
-      - subnet_result.openstack_subnets[0].allocation_pools | selectattr('start','equalto',item.start) | list | count > 0
+      - subnet_result.openstack_subnets[0].allocation_pools.0.start ==  '192.168.0.2'
-      - subnet_result.openstack_subnets[0].allocation_pools | selectattr('end','equalto',item.end) | list | count > 0
+      - subnet_result.openstack_subnets[0].allocation_pools.0.end == '192.168.0.8'
-  loop:
-    - {start: '192.168.0.2', end: '192.168.0.4'}
-    - {start: '192.168.0.5', end: '192.168.0.8'}
 
 - name: Delete subnet {{ subnet_name }}
   openstack.cloud.subnet:

ci/roles/volume/tasks/main.yml

@@ -8,10 +8,63 @@
      display_description: Test volume
   register: vol
 
+- name: Create volume snapshot
+  openstack.cloud.volume_snapshot:
+    cloud: "{{ cloud }}"
+    state: present
+    display_name: ansible_volume_snapshot
+    volume: ansible_volume
+  register: vol_snap
+
+- name: Get snapshot info
+  openstack.cloud.volume_snapshot_info:
+    cloud: "{{ cloud }}"
+    name: ansible_volume_snapshot
+  register: snap_info
+  ignore_errors: sdk_version is version('0.49', '<')
+
+- name: Create volume backup
+  openstack.cloud.volume_backup:
+    cloud: "{{ cloud }}"
+    state: present
+    display_name: ansible_volume_backup
+    volume: ansible_volume
+  register: vol_backup
+  ignore_errors: sdk_version is version('0.49', '<')
+
+- name: Get backup info
+  openstack.cloud.volume_backup_info:
+    cloud: "{{ cloud }}"
+    name: ansible_volume_backup
+  register: backup_info
+  ignore_errors: sdk_version is version('0.49', '<')
+
 - debug: var=vol
 
+- debug: var=vol_backup
+
+- debug: var=backup_info
+
+- debug: var=snap_info
+
+- name: Delete volume backup
+  openstack.cloud.volume_backup:
+    cloud: "{{ cloud }}"
+    display_name: ansible_volume_backup
+    state: absent
+  ignore_errors: sdk_version is version(0.49, '<')
+
+- name: Delete volume snapshot
+  openstack.cloud.volume_snapshot:
+    cloud: "{{ cloud }}"
+    display_name: ansible_volume_snapshot
+    volume: ansible_volume
+    state: absent
+
 - name: Delete volume
   openstack.cloud.volume:
      cloud: "{{ cloud }}"
      state: absent
      display_name: ansible_volume
+
+- include_tasks: volume_info.yml

ci/roles/volume/tasks/volume_info.yml

@@ -0,0 +1,155 @@
+- name: Get info about volumes and all projects for all SDK
+  openstack.cloud.volume_info:
+    cloud: "{{ cloud }}"
+    details: true
+    all_projects: true
+  register: all_sdk
+  ignore_errors: true
+
+- name: Check info for all projects
+  assert:
+    that:
+      # Rocky SDK doesn't have all_projects attribute
+      - >-
+        (all_sdk is failed and sdk_version is version(0.19, '<')) or
+        all_sdk is success
+
+- name: Get info about volumes for all SDK
+  openstack.cloud.volume_info:
+    cloud: "{{ cloud }}"
+    details: true
+  register: all_sdk1
+  ignore_errors: true
+
+- name: Check info for all SDK
+  assert:
+    that:
+      - all_sdk1 is success
+      - all_sdk1.volumes is defined
+
+- name: Run tests for SDK > 0.28 (from train)
+  when: sdk_version is version(0.28, '>')
+  block:
+
+    - name: Get info about volumes
+      openstack.cloud.volume_info:
+        cloud: "{{ cloud }}"
+        all_projects: true
+      register: delete
+
+    - name: Clean up volumes before the test
+      openstack.cloud.volume:
+        cloud: "{{ cloud }}"
+        state: absent
+        display_name: "{{ vol.name }}"
+      loop: "{{ delete.volumes }}"
+      loop_control:
+        loop_var: vol
+
+    - name: Create volume
+      openstack.cloud.volume:
+        cloud: "{{ cloud }}"
+        state: present
+        size: 1
+        display_name: ansible_test
+        display_description: testci
+      register: vol
+
+    - name: Get info about volumes
+      openstack.cloud.volume_info:
+        cloud: "{{ cloud }}"
+        details: true
+        all_projects: true
+      register: info
+
+    - name: Check info
+      assert:
+        that:
+          - info.volumes | selectattr("description", "equalto", "testci") | list | length == 1
+          - info.volumes.0.name == 'ansible_test'
+          - info.volumes.0.status == 'available'
+
+    - name: Get not detailed info about volumes
+      openstack.cloud.volume_info:
+        cloud: "{{ cloud }}"
+        details: false
+        all_projects: true
+      register: info1
+
+    - name: Check info
+      assert:
+        that:
+          - info1.volumes | selectattr("id", "equalto", "{{ info.volumes.0.id }}") | list | length == 1
+          - info1.volumes.0.name == 'ansible_test'
+          - info1.volumes.0.status == None
+
+    - name: Get info about volumes with name
+      openstack.cloud.volume_info:
+        cloud: "{{ cloud }}"
+        details: false
+        name: ansible_test
+        all_projects: true
+      register: info2
+
+    - name: Check info
+      assert:
+        that:
+          - info2.volumes | length == 1
+          - info2.volumes.0.name == 'ansible_test'
+
+    - name: Get info about volumes with non-existent name
+      openstack.cloud.volume_info:
+        cloud: "{{ cloud }}"
+        details: false
+        name: nothing_here
+        all_projects: true
+      register: info3
+
+    - name: Check info
+      assert:
+        that:
+          - info3.volumes | length == 0
+
+    - name: Get info about volumes
+      openstack.cloud.volume_info:
+        cloud: "{{ cloud }}"
+        details: false
+        name: ansible_test
+        all_projects: true
+      register: info4
+
+    - name: Check info
+      assert:
+        that:
+          - info4.volumes | length == 1
+          - info4.volumes.0.name == 'ansible_test'
+
+    - name: Get info about volumes not from all projects
+      openstack.cloud.volume_info:
+        cloud: "{{ cloud }}"
+        details: false
+        name: ansible_test
+      register: info4a
+
+    - name: Check info
+      assert:
+        that:
+          - info4a.volumes | length == 1
+          - info4a.volumes.0.name == 'ansible_test'
+
+    - name: Delete volume
+      openstack.cloud.volume:
+        cloud: "{{ cloud }}"
+        state: absent
+        display_name: ansible_test
+
+    - name: Get info when no volumes
+      openstack.cloud.volume_info:
+        cloud: "{{ cloud }}"
+        all_projects: true
+      register: info5
+
+    - name: Check info
+      assert:
+        that:
+          - info5.volumes | selectattr("name", "equalto", "ansible_test") | list | length == 0

ci/run-ansible-tests-collection.sh

@@ -54,6 +54,16 @@ fi
 shift $((OPTIND-1))
 TAGS=$( echo "$*" | tr ' ' , )
 
+# Install collections before dealing with Ansible virtual environments
+if [[ -z "$PIP_INSTALL" ]]; then
+    tox -ebuild
+    ansible-galaxy collection install $(ls build_artifact/openstack-cloud-*) --force
+    TEST_COLLECTIONS_PATHS=${HOME}/.ansible/collections:$ANSIBLE_COLLECTIONS_PATHS
+else
+    pip freeze | grep ansible-collections-openstack
+    TEST_COLLECTIONS_PATHS=$VIRTUAL_ENV/share/ansible/collections:$ANSIBLE_COLLECTIONS_PATHS
+fi
+
 # We need to source the current tox environment so that Ansible will
 # be setup for the correct python environment.
 source $ENVDIR/bin/activate
@@ -96,16 +106,34 @@ then
   exit 1
 fi
 
-# install collections
+# In case of Octavia enabled:
-tox -ebuild
+_octavia_image_path="/tmp/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2"
-ansible-galaxy collection build --force . --output-path ./build_artifact
+if systemctl list-units --full -all | grep -Fq "devstack@o-api.service" && \
-ansible-galaxy collection install $(ls build_artifact/openstack-cloud-*) --force
+  test -f "$_octavia_image_path"
+then
+    # Upload apmhora image for Octavia to test load balancers
+    OCTAVIA_AMP_IMAGE_FILE=${OCTAVIA_AMP_IMAGE_FILE:-"$_octavia_image_path"}
+    OCTAVIA_AMP_IMAGE_NAME=${OCTAVIA_AMP_IMAGE_NAME:-"test-only-amphora-x64-haproxy-ubuntu-bionic"}
+    OCTAVIA_AMP_IMAGE_SIZE=${OCTAVIA_AMP_IMAGE_SIZE:-3}
+    openstack --os-cloud=${CLOUD} image create \
+        --container-format bare \
+        --disk-format qcow2 \
+        --private \
+        --file $OCTAVIA_AMP_IMAGE_FILE \
+        --project service $OCTAVIA_AMP_IMAGE_NAME
+    openstack --os-cloud=${CLOUD} image set --tag amphora $OCTAVIA_AMP_IMAGE_NAME
+    # End of Octavia preparement
+else
+    tag_opt="$tag_opt --skip-tags loadbalancer"
+fi
+
 # Discover openstackSDK version
 SDK_VER=$(python -c "import openstack; print(openstack.version.__version__)")
 pushd ci/
 # run tests
-ANSIBLE_COLLECTIONS_PATHS=${HOME}/.ansible/collections ansible-playbook \
+set -o pipefail
+ANSIBLE_COLLECTIONS_PATHS=$TEST_COLLECTIONS_PATHS ansible-playbook \
     -vvv ./run-collection.yml \
     -e "sdk_version=${SDK_VER} cloud=${CLOUD} image=${IMAGE} ${ANSIBLE_VARS}" \
-    ${tag_opt}
+    ${tag_opt} 2>&1 | sudo tee /opt/stack/logs/test_output.log
 popd

ci/run-collection.yml

@@ -4,12 +4,19 @@
   gather_facts: true
 
   roles:
+    - { role: address_scope, tags: address_scope }
     - { role: auth, tags: auth }
     - { role: client_config, tags: client_config }
+    - { role: dns_zone_info, tags: dns_zone_info }
+    - role: object_container
+      tags: object_container
+      when: sdk_version is version(0.18, '>=')
     - { role: group, tags: group }
-    # TODO(mordred) Reenable this once the fixed openstack.cloud.image winds up in an
+    - role: dns
-    # upstream ansible release.
+      tags: dns
-    # - { role: image, tags: image }
+      when: sdk_version is version(0.28, '>=')
+    - { role: floating_ip_info, tags: floating_ip_info }
+    - { role: image, tags: image }
     - { role: keypair, tags: keypair }
     - { role: keystone_domain, tags: keystone_domain }
     - role: keystone_mapping
@@ -23,13 +30,17 @@
       when: sdk_version is version(0.44, '>=')
     - { role: keystone_role, tags: keystone_role }
     - { role: network, tags: network }
+    - role: neutron_rbac
+      tags:
+        - rbac
+        - neutron_rbac
     - { role: nova_flavor, tags: nova_flavor }
+    - role: nova_services
+      tags: nova_services
+      when: sdk_version is version(0.44, '>=')
     - { role: object, tags: object }
     - { role: port, tags: port }
     - { role: project, tags: project }
-    - role: project_properties
-      tags: project_properties
-      when: sdk_version is version("0.45.01", '>')
     - { role: router, tags: router }
     - { role: security_group, tags: security_group }
     - { role: server, tags: server }
@@ -38,3 +49,9 @@
     - { role: user_group, tags: user_group }
     - { role: user_role, tags: user_role }
     - { role: volume, tags: volume }
+    - role: orchestration
+      tags: orchestrate
+      when: sdk_version is version("0.53.0", '>=')
+    - role: loadbalancer
+      tags: loadbalancer
+    - { role: floating_ip, tags: floating_ip }

contrib/generate_module.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+# For resource changing module
+ansible localhost -c local -m template -a "src=module_template.py.j2 dest=my_module.py" -e @module_template_vars.yaml
+# For resource info collection module
+ansible localhost -c local -m template -a "src=module_info_template.py.j2 dest=my_module_info.py" -e @module_template_vars.yaml

contrib/module_info_template.py.j2

@@ -0,0 +1,110 @@
+#!/usr/bin/python
+# coding: utf-8 -*-
+
+# Copyright (c) 2020, {{ author_name }} <{{ author_mail }}>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+DOCUMENTATION = '''
+---
+module: {{ module_name }}
+short_description: {{ module_short_description }}
+author: OpenStack Ansible SIG
+description:
+  - {{ module_long_description }}
+options:
+  {{ options|to_nice_yaml(indent=2,sort_keys=false)|indent(width=2)|trim }}
+
+requirements:
+  - "python >= 3.6"
+  - "openstacksdk"
+
+extends_documentation_fragment:
+  - openstack.cloud.openstack
+'''
+
+RETURN = '''
+{{ module_returns_example|to_nice_yaml(indent=2,sort_keys=false) }}
+'''
+
+EXAMPLES = '''
+# What modules does for example
+- {{ module_name }}:
+    name:
+      - name1
+      - name2
+    timeout: 200
+'''
+
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
+
+
+class {{ module_name.split("_")|map("capitalize")|list|join("") }}Module(OpenStackModule):
+
+    argument_spec = dict(
+{% for k, v in options.items() %}
+{{ k | indent( width=8, indentfirst=True) }}=dict(type='{{ v.type }}'
+{%- if 'required' in v %}, required={{ v.required }}{% endif %}
+{%- if 'elements' in v %}, elements={{ v.elements }}{% endif %}
+{%- if 'default' in v %}, default={% if v.type == 'str' %}"{{ v.default }}"{% else %}{{ v.default }}{% endif %}{% endif %}
+{%- if 'aliases' in v %}, aliases={{ v.aliases }}{% endif %}
+{%- if 'choices' in v %}, choices={{ v.choices }}{% endif %}),
+{% endfor %}
+    ),
+
+    # Optional arguments requirements
+    module_kwargs = dict(
+        required_if=[
+            ['action', 'rebuild', ['image']],  # if need to rebuild image (only), the 'image' is required
+            ["state", "present", ["username", "user_roles"]],  # for creating user 'user_roles' is required
+            ["state", "absent", ["username"]],  # for state 'absent' only username is required
+        ],
+        required_by=dict(  # for weather and population 'city' is required to set
+            weather=('city'),
+            population=('city'),
+        ),
+        mutually_exclusive=[
+            ['use_cloud1', 'use_cloud2']  # can't run on both, choose only one to set
+        ],
+        required_together=[
+            ['remove_image', 'image_name']  # if need to remove image, must to specify which one
+        ],
+        required_one_of_args=[["password", "password_hash"]],  # one of these args must be set
+        supports_check_mode={{ check_mode_support }},  # good practice is to support check_mode
+    )
+
+    # you main funciton is here
+    def run(self):
+        # do any arguments check if needed
+        data = self.preliminary_checks()
+        # check if we need to prepare various filters for results
+        filters = self.prepare_filters()
+        # run SDK call to get information about requested resource
+        result = self.conn.compute.resource_list(
+            filters=filters,
+            detailed=self.params['detailed'],
+            # any other parameters
+            )
+        # process results if they require a change
+        result = self.normalize_result()
+        self.results.update({'resource_name': result})
+
+    def preliminary_checks(self):
+        # you checks before running like arguments and options checks, etc
+        return data
+
+    def prepare_filters(self):
+        # process filters if they require additional checks
+        return filters
+
+    def normalize_result(self):
+        # process filters if they require additional checks
+        return result
+
+
+def main():
+    module = {{ module_name.split("_")|map("capitalize")|list|join("") }}Module()
+    module()
+
+
+if __name__ == '__main__':
+    main()

contrib/module_template.py.j2

@@ -0,0 +1,149 @@
+#!/usr/bin/python
+# coding: utf-8 -*-
+
+# Copyright (c) 2020, {{ author_name }} <{{ author_mail }}>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+DOCUMENTATION = '''
+---
+module: {{ module_name }}
+short_description: {{ module_short_description }}
+author: OpenStack Ansible SIG
+description:
+  - {{ module_long_description }}
+options:
+  {{ options|to_nice_yaml(indent=2,sort_keys=false)|indent(width=2)|trim }}
+
+requirements:
+  - "python >= 3.6"
+  - "openstacksdk"
+
+extends_documentation_fragment:
+  - openstack.cloud.openstack
+'''
+
+RETURN = '''
+{{ module_returns_example|to_nice_yaml(indent=2,sort_keys=false) }}
+'''
+
+EXAMPLES = '''
+# What modules does for example
+- {{ module_name }}:
+    action: pause
+    auth:
+      auth_url: https://identity.example.com
+      username: admin
+      password: admin
+      project_name: admin
+    server: vm1
+    timeout: 200
+'''
+
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
+
+
+class {{ module_name.split("_")|map("capitalize")|list|join("") }}Module(OpenStackModule):
+
+    argument_spec = dict(
+{% for k, v in options.items() %}
+{{ k | indent( width=8, indentfirst=True) }}=dict(type='{{ v.type }}'
+{%- if 'required' in v %}, required={{ v.required }}{% endif %}
+{%- if 'elements' in v %}, elements={{ v.elements }}{% endif %}
+{%- if 'default' in v %}, default={% if v.type == 'str' %}"{{ v.default }}"{% else %}{{ v.default }}{% endif %}{% endif %}
+{%- if 'aliases' in v %}, aliases={{ v.aliases }}{% endif %}
+{%- if 'choices' in v %}, choices={{ v.choices }}{% endif %}),
+{% endfor %}
+    ),
+
+    # Optional arguments requirements
+    module_kwargs = dict(
+        required_if=[
+            ['action', 'rebuild', ['image']],  # if need to rebuild image (only), the 'image' is required
+            ["state", "present", ["username", "user_roles"]],  # for creating user 'user_roles' is required
+            ["state", "absent", ["username"]],  # for state 'absent' only username is required
+        ],
+        required_by=dict(  # for weather and population 'city' is required to set
+            weather=('city'),
+            population=('city'),
+        ),
+        mutually_exclusive=[
+            ['use_cloud1', 'use_cloud2']  # can't run on both, choose only one to set
+        ],
+        required_together=[
+            ['remove_image', 'image_name']  # if need to remove image, must to specify which one
+        ],
+        required_one_of_args=[["password", "password_hash"]],  # one of these args must be set
+        supports_check_mode={{ check_mode_support }},  # good practice is to support check_mode
+    )
+
+    # you main funciton is here
+    def run(self):
+        # do any arguments check if needed
+        data = self.preliminary_checks()
+        # check if we need to run or the resource is in desired state already
+        must_run = self.check_mode_test()
+        # if the resource is good
+        if not must_run:
+            # updated returned results if need
+            self.results.update({"returning_data": some_data})
+            # returning {changed: False, ...} because we didn't change resource
+            self.exit_json(self.results)
+        # do something if must to run the module
+        self.execute()
+
+    def preliminary_checks(self):
+        # you checks before running like arguments and options checks, etc
+        return data
+
+    def check_mode_test(self):
+        # check the idempotency - does module should do anything or
+        # it's already in the desired state?
+        return must_run
+
+    def execute(self):
+        # doing here what should be done, using OpenstackSDK
+        # for example actions for resource:
+        # self.params['action'] = "rebuild"
+        action_name = self.params['action'] + "_resource"  # action_name='rebuild_resource'
+        try:
+            # find a method "rebuild_resource" in openstack SDK compute:
+            func_name = getattr(self.conn.compute, action_name)
+            # found self.conn.compute.rebuild_resource
+        except AttributeError:
+            self.fail_json(
+                msg="Method %s wasn't found in OpenstackSDK compute" % action_name)
+        summary = func_name(data)  # summary = self.conn.compute.rebuild_resource(data)
+        self.results.update({"returning_data": summary})
+        # that's it, exiting, results will be returned from module automatically
+
+    # another option for states
+    def execute_with_action_map(self):
+        actions_map = {
+            'start': self._start_resource,
+            'stop': self._stop_resource,
+            'restart': self._restart_resource,
+            'absent': self._absent_resource,
+        }
+        summary = actions_map(self.params['action'])()  # summary = self.start_resource()
+        self.results.update({"changed": True, "data2return": summary})
+
+    def _start_resource(self, some_other_data):
+        pass
+
+    def _stop_resource(self, some_other_data):
+        pass
+
+    def _restart_resource(self, some_other_data):
+        pass
+
+    def _absent_resource(self, some_other_data):
+        pass
+
+
+def main():
+    module = {{ module_name.split("_")|map("capitalize")|list|join("") }}Module()
+    module()
+
+
+if __name__ == '__main__':
+    main()

contrib/module_template_vars.yaml

@@ -0,0 +1,81 @@
+##### PLEASE READ BEFORE #####
+
+# Module format and documentation
+# https://docs.ansible.com/ansible/latest/dev_guide/developing_modules_documenting.html#module-format-and-documentation
+
+
+module_name: server_manage
+author_name: 'Happy Ansible User'
+author_mail: dontwriteme@example.com
+module_short_description: "Doing something very useful"
+module_long_description: "Here is the place to release your inner writer"
+check_mode_support: True  # good practice to support check_mode:
+# https://docs.ansible.com/ansible/latest/user_guide/playbooks_checkmode.html#check-mode-dry-run
+
+module_returns_example:
+  image:
+    description: Image inspection results for the image that was pulled, pushed, or built.
+    returned: always  # or 'success' in case of success only
+    type: dict
+    sample:
+      Image Name: Sample Image
+      Image ID: e6471d00796a13de8142c15d7ad3a44f
+      Nested:
+        images list:
+          - data 1
+          - image 1234
+        boolean_1: True
+
+options:
+  optional_string:
+    description:
+      - This variable is set for having string argument, for example 'action'
+    type: str
+    required: true
+    default: "my_lovely_action"
+    choices:
+      - allowed_option1
+      - allowed_option1
+  optional_boolean:
+    description:
+      - This variable is set for having a boolean argument, for example whether
+        to wait for resource creation or not
+    type: bool
+    required: false # may be omitted if false
+    # and no default because not required
+  optional_integer:
+    description:
+      - This variable is set for having a integer argument, for example how many
+        seconds to wait for the resource to come alive
+    required: true
+    default: 60
+    type: int
+    aliases: # sometimes we allow to pass the same option with different name
+      - old_optional_integer_name
+      - different_option_name
+  optional_list:
+    description:
+      - This variable is set for having a list argument, for example files need
+        to create with the resource
+    type: list
+    elements: str  # type of elements of the list, can be dict, str, int, list
+  optional_dictionary:
+    description:
+      - This variable is set for having a dictionary argument, for example to
+        set environment variables or to pass more complex data to SDK
+    required: true
+    default: {}
+    type: dict
+    suboptions:
+      suboption_1:
+        description:
+          - suboption_1 description, what it does
+        type: str
+        aliases:
+          - suboption_1_another_name
+      suboption_2:
+        description:
+          - suboption_2 description, what it does
+        type: list
+        elements: str
+        default: []

docs/openstack_guidelines.rst

@@ -58,10 +58,10 @@ Libraries
   users as a primary audience, they are for intra-server communication.
 * All modules should be registered in ``meta/action_groups.yml`` for enabling the
   variables to be set in `group level
-  <https://docs.ansible.com/ansible/latest/user_guide/playbooks_module_defaults.html>`.
+  <https://docs.ansible.com/ansible/latest/user_guide/playbooks_module_defaults.html>`_.
 
 Testing
 -------
 
 * Integration testing is currently done in `OpenStack's CI system
-  <https://opendev.org/openstack/ansible-collections-openstack/src/branch/master/zuul.yaml>`
+  <https://opendev.org/openstack/ansible-collections-openstack/src/branch/master/.zuul.yaml>`_

galaxy.yml

@@ -0,0 +1,36 @@
+namespace: openstack
+name: cloud
+readme: README.md
+authors: Openstack
+description: Openstack Ansible modules
+license: GPL-3.0-or-later
+tags:
+  - cloud
+  - openstack
+dependencies: {}
+repository: https://opendev.org/openstack/ansible-collections-openstack
+documentation: https://docs.ansible.com/ansible/latest/collections/openstack/cloud/index.html
+homepage: https://opendev.org/openstack/ansible-collections-openstack
+issues: https://storyboard.openstack.org/#!/project/openstack/ansible-collections-openstack
+build_ignore:
+  - "*.tar.gz"
+  - build_artifact
+  - ci
+  - galaxy.yml.in
+  - setup.cfg
+  - test-requirements*
+  - tests
+  - tools
+  - tox.ini
+  - .gitignore
+  - .gitreview
+  - .zuul.yaml
+  - .pytest_cache
+  - importer_result.json
+  - .tox
+  - .env
+  - .vscode
+  - ansible_collections_openstack.egg-info
+  - contrib
+  - changelogs
+version: 1.7.0

galaxy.yml.in

@@ -8,10 +8,10 @@ tags:
   - cloud
   - openstack
 dependencies: {}
-repository: https://opendev.org/openstack/ansible-collections-openstack.git
+repository: https://opendev.org/openstack/ansible-collections-openstack
-documentation: https://docs.openstack.org/ansible-collections-openstack
+documentation: https://docs.ansible.com/ansible/latest/collections/openstack/cloud/index.html
-homepage: https://opendev.org
+homepage: https://opendev.org/openstack/ansible-collections-openstack
-issues: https://review.opendev.org/q/project:openstack/ansible-collections-openstack
+issues: https://storyboard.openstack.org/#!/project/openstack/ansible-collections-openstack
 build_ignore:
   - "*.tar.gz"
   - build_artifact
@@ -27,3 +27,9 @@ build_ignore:
   - .zuul.yaml
   - .pytest_cache
   - importer_result.json
+  - .tox
+  - .env
+  - ansible_collections_openstack.egg-info
+  - contrib
+  - changelogs/.plugin-cache.yaml
+  - changelogs/fragments

meta/action_groups.yml

@@ -1,269 +0,0 @@
-openstack:
-- auth
-- baremetal_inspect
-- baremetal_inspect
-- baremetal_node
-- baremetal_node
-- baremetal_node_action
-- baremetal_node_action
-- catalog_endpoint
-- catalog_service
-- catalog_service
-- coe_cluster
-- coe_cluster_template
-- compute_flavor
-- compute_flavor
-- compute_flavor
-- compute_flavor_info
-- compute_flavor_info
-- config
-- config
-- dns_zone
-- dns_zone
-- endpoint
-- endpoint
-- federation_idp
-- federation_idp
-- federation_idp_info
-- federation_idp_info
-- federation_mapping
-- federation_mapping
-- federation_mapping_info
-- federation_mapping_info
-- floating_ip
-- group_assignment
-- group_assignment
-- host_aggregate
-- host_aggregate
-- identity_domain
-- identity_domain
-- identity_domain_info
-- identity_domain_info
-- identity_group
-- identity_group
-- identity_group_info
-- identity_group_info
-- identity_role
-- identity_role
-- identity_user
-- identity_user
-- identity_user_info
-- identity_user_info
-- image
-- image_info
-- keypair
-- keystone_federation_protocol
-- keystone_federation_protocol_info
-- lb_listener
-- lb_listener
-- lb_member
-- lb_member
-- lb_pool
-- lb_pool
-- loadbalancer
-- network
-- networks_info
-- object
-- port
-- port_info
-- project
-- project_access
-- project_info
-- quota
-- recordset
-- role_assignment
-- role_assignment
-- router
-- routers_info
-- security_group
-- security_group_rule
-- server
-- server_action
-- server_group
-- server_info
-- server_metadata
-- server_volume
-- stack
-- subnet
-- subnets_info
-- volume
-- volume_snapshot
-os:
-- auth
-- baremetal_inspect
-- baremetal_inspect
-- baremetal_node
-- baremetal_node
-- baremetal_node_action
-- baremetal_node_action
-- catalog_endpoint
-- catalog_service
-- catalog_service
-- coe_cluster
-- coe_cluster_template
-- compute_flavor
-- compute_flavor
-- compute_flavor
-- compute_flavor_info
-- compute_flavor_info
-- config
-- config
-- dns_zone
-- dns_zone
-- endpoint
-- endpoint
-- federation_idp
-- federation_idp
-- federation_idp_info
-- federation_idp_info
-- federation_mapping
-- federation_mapping
-- federation_mapping_info
-- federation_mapping_info
-- floating_ip
-- group_assignment
-- group_assignment
-- host_aggregate
-- host_aggregate
-- identity_domain
-- identity_domain
-- identity_domain_info
-- identity_domain_info
-- identity_group
-- identity_group
-- identity_group_info
-- identity_group_info
-- identity_role
-- identity_role
-- identity_user
-- identity_user
-- identity_user_info
-- identity_user_info
-- image
-- image_info
-- keypair
-- keystone_federation_protocol
-- keystone_federation_protocol_info
-- lb_listener
-- lb_listener
-- lb_member
-- lb_member
-- lb_pool
-- lb_pool
-- loadbalancer
-- network
-- networks_info
-- object
-- port
-- port_info
-- project
-- project_access
-- project_info
-- quota
-- recordset
-- role_assignment
-- role_assignment
-- router
-- routers_info
-- security_group
-- security_group_rule
-- server
-- server_action
-- server_group
-- server_info
-- server_metadata
-- server_volume
-- stack
-- subnet
-- subnets_info
-- volume
-- volume_snapshot
-- os_auth
-- os_client_config
-- os_client_config
-- os_coe_cluster
-- os_coe_cluster_template
-- os_endpoint
-- os_flavor
-- os_flavor_info
-- os_flavor_info
-- os_floating_ip
-- os_group
-- os_group
-- os_group_info
-- os_group_info
-- os_image
-- os_image_info
-- os_ironic
-- os_ironic
-- os_ironic_inspect
-- os_ironic_inspect
-- os_ironic_node
-- os_ironic_node
-- os_keypair
-- os_keystone_domain
-- os_keystone_domain
-- os_keystone_domain_info
-- os_keystone_domain_info
-- os_keystone_endpoint
-- os_keystone_endpoint
-- os_keystone_federation_protocol
-- os_keystone_federation_protocol_info
-- os_keystone_identity_provider
-- os_keystone_identity_provider
-- os_keystone_identity_provider_info
-- os_keystone_identity_provider_info
-- os_keystone_mapping
-- os_keystone_mapping
-- os_keystone_mapping_info
-- os_keystone_mapping_info
-- os_keystone_role
-- os_keystone_role
-- os_keystone_service
-- os_keystone_service
-- os_listener
-- os_listener
-- os_loadbalancer
-- os_member
-- os_member
-- os_network
-- os_networks_info
-- os_nova_flavor
-- os_nova_flavor
-- os_nova_host_aggregate
-- os_nova_host_aggregate
-- os_object
-- os_pool
-- os_pool
-- os_port
-- os_port_info
-- os_project
-- os_project_access
-- os_project_info
-- os_quota
-- os_recordset
-- os_router
-- os_routers_info
-- os_security_group
-- os_security_group_rule
-- os_server
-- os_server_action
-- os_server_group
-- os_server_info
-- os_server_metadata
-- os_server_volume
-- os_stack
-- os_subnet
-- os_subnets_info
-- os_user
-- os_user
-- os_user_group
-- os_user_group
-- os_user_info
-- os_user_info
-- os_user_role
-- os_user_role
-- os_volume
-- os_volume_snapshot
-- os_zone
-- os_zone

meta/runtime.yml

@@ -1,317 +1,612 @@
+requires_ansible: ">=2.8"
+action_groups:
+  openstack:
+    - address_scope
+    - auth
+    - baremetal_inspect
+    - baremetal_inspect
+    - baremetal_node
+    - baremetal_node
+    - baremetal_node_action
+    - baremetal_node_action
+    - baremetal_node_info
+    - baremetal_port_info
+    - baremetal_port
+    - catalog_endpoint
+    - catalog_service
+    - catalog_service
+    - coe_cluster
+    - coe_cluster_template
+    - compute_flavor
+    - compute_flavor
+    - compute_flavor
+    - compute_flavor_info
+    - compute_flavor_info
+    - compute_service_info
+    - compute_service_info
+    - config
+    - config
+    - dns_zone
+    - dns_zone_info
+    - endpoint
+    - endpoint
+    - federation_idp
+    - federation_idp
+    - federation_idp_info
+    - federation_idp_info
+    - federation_mapping
+    - federation_mapping
+    - federation_mapping_info
+    - federation_mapping_info
+    - floating_ip
+    - floating_ip_info
+    - group_assignment
+    - group_assignment
+    - host_aggregate
+    - host_aggregate
+    - identity_domain
+    - identity_domain
+    - identity_domain_info
+    - identity_domain_info
+    - identity_group
+    - identity_group
+    - identity_group_info
+    - identity_group_info
+    - identity_role
+    - identity_role
+    - identity_user
+    - identity_user
+    - identity_user_info
+    - identity_user_info
+    - image
+    - image_info
+    - keypair
+    - keypair_info
+    - keystone_federation_protocol
+    - keystone_federation_protocol_info
+    - lb_listener
+    - lb_listener
+    - lb_member
+    - lb_member
+    - lb_pool
+    - lb_pool
+    - loadbalancer
+    - network
+    - networks_info
+    - object
+    - object_container
+    - port
+    - port_info
+    - project
+    - project_access
+    - project_info
+    - quota
+    - recordset
+    - role_assignment
+    - role_assignment
+    - router
+    - routers_info
+    - security_group
+    - security_group_info
+    - security_group_rule
+    - security_group_rule_info
+    - server
+    - server_action
+    - server_group
+    - server_info
+    - server_metadata
+    - server_volume
+    - stack
+    - subnet
+    - subnets_info
+    - volume
+    - volume_backup
+    - volume_backup_info
+    - volume_info
+    - volume_snapshot
+    - volume_snapshot_info
+  os:
+    - auth
+    - baremetal_inspect
+    - baremetal_inspect
+    - baremetal_node
+    - baremetal_node
+    - baremetal_node_action
+    - baremetal_node_action
+    - catalog_endpoint
+    - catalog_service
+    - catalog_service
+    - coe_cluster
+    - coe_cluster_template
+    - compute_flavor
+    - compute_flavor
+    - compute_flavor
+    - compute_flavor_info
+    - compute_flavor_info
+    - config
+    - config
+    - dns_zone
+    - dns_zone
+    - endpoint
+    - endpoint
+    - federation_idp
+    - federation_idp
+    - federation_idp_info
+    - federation_idp_info
+    - federation_mapping
+    - federation_mapping
+    - federation_mapping_info
+    - federation_mapping_info
+    - floating_ip
+    - group_assignment
+    - group_assignment
+    - host_aggregate
+    - host_aggregate
+    - identity_domain
+    - identity_domain
+    - identity_domain_info
+    - identity_domain_info
+    - identity_group
+    - identity_group
+    - identity_group_info
+    - identity_group_info
+    - identity_role
+    - identity_role
+    - identity_user
+    - identity_user
+    - identity_user_info
+    - identity_user_info
+    - image
+    - image_info
+    - keypair
+    - keypair_info
+    - keystone_federation_protocol
+    - keystone_federation_protocol_info
+    - lb_listener
+    - lb_listener
+    - lb_member
+    - lb_member
+    - lb_pool
+    - lb_pool
+    - loadbalancer
+    - network
+    - networks_info
+    - object
+    - object_container
+    - port
+    - port_info
+    - project
+    - project_access
+    - project_info
+    - quota
+    - recordset
+    - role_assignment
+    - role_assignment
+    - router
+    - routers_info
+    - security_group
+    - security_group_info
+    - security_group_rule
+    - security_group_rule_info
+    - server
+    - server_action
+    - server_group
+    - server_info
+    - server_metadata
+    - server_volume
+    - stack
+    - subnet
+    - subnets_info
+    - volume
+    - volume_backup
+    - volume_backup_info
+    - volume_info
+    - volume_snapshot
+    - volume_snapshot_info
+    - os_auth
+    - os_client_config
+    - os_client_config
+    - os_coe_cluster
+    - os_coe_cluster_template
+    - os_endpoint
+    - os_flavor
+    - os_flavor_info
+    - os_flavor_info
+    - os_floating_ip
+    - os_group
+    - os_group
+    - os_group_info
+    - os_group_info
+    - os_image
+    - os_image_info
+    - os_ironic
+    - os_ironic
+    - os_ironic_inspect
+    - os_ironic_inspect
+    - os_ironic_node
+    - os_ironic_node
+    - os_keypair
+    - os_keystone_domain
+    - os_keystone_domain
+    - os_keystone_domain_info
+    - os_keystone_domain_info
+    - os_keystone_endpoint
+    - os_keystone_endpoint
+    - os_keystone_federation_protocol
+    - os_keystone_federation_protocol_info
+    - os_keystone_identity_provider
+    - os_keystone_identity_provider
+    - os_keystone_identity_provider_info
+    - os_keystone_identity_provider_info
+    - os_keystone_mapping
+    - os_keystone_mapping
+    - os_keystone_mapping_info
+    - os_keystone_mapping_info
+    - os_keystone_role
+    - os_keystone_role
+    - os_keystone_service
+    - os_keystone_service
+    - os_listener
+    - os_listener
+    - os_loadbalancer
+    - os_member
+    - os_member
+    - os_network
+    - os_networks_info
+    - os_nova_flavor
+    - os_nova_flavor
+    - os_nova_host_aggregate
+    - os_nova_host_aggregate
+    - os_object
+    - os_pool
+    - os_pool
+    - os_port
+    - os_port_info
+    - os_project
+    - os_project_access
+    - os_project_info
+    - os_quota
+    - os_recordset
+    - os_router
+    - os_routers_info
+    - os_security_group
+    - os_security_group_rule
+    - os_server
+    - os_server_action
+    - os_server_group
+    - os_server_info
+    - os_server_metadata
+    - os_server_volume
+    - os_stack
+    - os_subnet
+    - os_subnets_info
+    - os_user
+    - os_user
+    - os_user_group
+    - os_user_group
+    - os_user_info
+    - os_user_info
+    - os_user_role
+    - os_user_role
+    - os_volume
+    - os_volume_snapshot
+    - os_zone
+    - os_zone
+
 plugin_routing:
   modules:
     os_auth:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.auth
       redirect: openstack.cloud.auth
     os_client_config:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.config
       redirect: openstack.cloud.config
     os_coe_cluster:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.coe_cluster
       redirect: openstack.cloud.coe_cluster
     os_coe_cluster_template:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.coe_cluster_template
       redirect: openstack.cloud.coe_cluster_template
     os_endpoint:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.catalog_endpoint
       redirect: openstack.cloud.catalog_endpoint
     os_flavor:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.compute_flavor
       redirect: openstack.cloud.compute_flavor
     os_flavor_info:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.compute_flavor_info
       redirect: openstack.cloud.compute_flavor_info
     os_floating_ip:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.floating_ip
       redirect: openstack.cloud.floating_ip
     os_group:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.identity_group
       redirect: openstack.cloud.identity_group
     os_group_info:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.identity_group_info
       redirect: openstack.cloud.identity_group_info
     os_image:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.image
       redirect: openstack.cloud.image
     os_image_info:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.image_info
       redirect: openstack.cloud.image_info
     os_ironic:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.baremetal_node
       redirect: openstack.cloud.baremetal_node
     os_ironic_inspect:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.baremetal_inspect
       redirect: openstack.cloud.baremetal_inspect
     os_ironic_node:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.baremetal_node_action
       redirect: openstack.cloud.baremetal_node_action
     os_keypair:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.keypair
       redirect: openstack.cloud.keypair
     os_keystone_domain:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.identity_domain
       redirect: openstack.cloud.identity_domain
     os_keystone_domain_info:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.identity_domain_info
       redirect: openstack.cloud.identity_domain_info
     os_keystone_endpoint:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.endpoint
       redirect: openstack.cloud.endpoint
     os_keystone_federation_protocol:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.keystone_federation_protocol
       redirect: openstack.cloud.keystone_federation_protocol
     os_keystone_federation_protocol_info:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.keystone_federation_protocol_info
       redirect: openstack.cloud.keystone_federation_protocol_info
     os_keystone_identity_provider:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.federation_idp
       redirect: openstack.cloud.federation_idp
     os_keystone_identity_provider_info:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.federation_idp_info
       redirect: openstack.cloud.federation_idp_info
     os_keystone_mapping:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.federation_mapping
       redirect: openstack.cloud.federation_mapping
     os_keystone_mapping_info:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.federation_mapping_info
       redirect: openstack.cloud.federation_mapping_info
     os_keystone_role:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.identity_role
       redirect: openstack.cloud.identity_role
     os_keystone_service:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.catalog_service
       redirect: openstack.cloud.catalog_service
     os_listener:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.lb_listener
       redirect: openstack.cloud.lb_listener
     os_loadbalancer:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.loadbalancer
       redirect: openstack.cloud.loadbalancer
     os_member:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.lb_member
       redirect: openstack.cloud.lb_member
     os_network:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.network
       redirect: openstack.cloud.network
     os_networks_info:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.networks_info
       redirect: openstack.cloud.networks_info
     os_nova_flavor:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.compute_flavor
       redirect: openstack.cloud.compute_flavor
     os_nova_host_aggregate:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.host_aggregate
       redirect: openstack.cloud.host_aggregate
     os_object:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.object
       redirect: openstack.cloud.object
     os_pool:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.lb_pool
       redirect: openstack.cloud.lb_pool
     os_port:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.port
       redirect: openstack.cloud.port
     os_port_info:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.port_info
       redirect: openstack.cloud.port_info
     os_project:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.project
       redirect: openstack.cloud.project
     os_project_access:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.project_access
       redirect: openstack.cloud.project_access
     os_project_info:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.project_info
       redirect: openstack.cloud.project_info
     os_quota:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.quota
       redirect: openstack.cloud.quota
     os_recordset:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.recordset
       redirect: openstack.cloud.recordset
     os_router:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.router
       redirect: openstack.cloud.router
     os_routers_info:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.routers_info
       redirect: openstack.cloud.routers_info
     os_security_group:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.security_group
       redirect: openstack.cloud.security_group
     os_security_group_rule:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.security_group_rule
       redirect: openstack.cloud.security_group_rule
     os_server:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.server
       redirect: openstack.cloud.server
     os_server_action:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.server_action
       redirect: openstack.cloud.server_action
     os_server_group:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.server_group
       redirect: openstack.cloud.server_group
     os_server_info:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.server_info
       redirect: openstack.cloud.server_info
     os_server_metadata:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.server_metadata
       redirect: openstack.cloud.server_metadata
     os_server_volume:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.server_volume
       redirect: openstack.cloud.server_volume
     os_stack:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.stack
       redirect: openstack.cloud.stack
     os_subnet:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.subnet
       redirect: openstack.cloud.subnet
     os_subnets_info:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.subnets_info
       redirect: openstack.cloud.subnets_info
     os_user:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.identity_user
       redirect: openstack.cloud.identity_user
     os_user_group:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.group_assignment
       redirect: openstack.cloud.group_assignment
     os_user_info:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.identity_user_info
       redirect: openstack.cloud.identity_user_info
     os_user_role:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.role_assignment
       redirect: openstack.cloud.role_assignment
     os_volume:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.volume
       redirect: openstack.cloud.volume
     os_volume_snapshot:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.volume_snapshot
       redirect: openstack.cloud.volume_snapshot
     os_zone:
       deprecation:
-        removal_date: TBD
+        removal_date: 2021-12-12
         warning_text: os_ prefixed module names are deprecated, use openstack.cloud.dns_zone
       redirect: openstack.cloud.dns_zone

plugins/doc_fragments/openstack.py

@@ -61,7 +61,6 @@ options:
       - Whether or not SSL API requests should be verified.
       - Before Ansible 2.3 this defaulted to C(yes).
     type: bool
-    default: no
     aliases: [ verify ]
   ca_cert:
     description:

plugins/inventory/openstack.py

@@ -10,9 +10,7 @@ DOCUMENTATION = '''
 ---
 name: openstack
 plugin_type: inventory
-author:
+author: OpenStack Ansible SIG
-    - "Marco Vito Moscaritolo <marco@agavee.com>"
-    - "Jesse Keating <jesse.keating@rackspace.com>"
 short_description: OpenStack inventory source
 requirements:
     - "openstacksdk >= 0.28"
@@ -24,7 +22,7 @@ options:
     plugin:
         description: token that ensures this is a source file for the 'openstack' plugin.
         required: True
-        choices: ['openstack']
+        choices: ['openstack', 'openstack.cloud.openstack']
     show_all:
         description: toggles showing all vms vs only those with a working IP
         type: bool
@@ -44,6 +42,13 @@ options:
             - name
             - uuid
         default: "name"
+    use_names:
+        description: |
+            Use the host's 'name' instead of 'interface_ip' for the 'ansible_host' and
+            'ansible_ssh_host' facts. This might be desired when using jump or
+            bastion hosts and the name is the FQDN of the host.
+        type: bool
+        default: 'no'
     expand_hostvars:
         description: |
             Run extra commands on each host to fill in additional
@@ -100,6 +105,10 @@ options:
         description: Add hosts to group based on Jinja2 conditionals.
         type: dictionary
         default: {}
+    legacy_groups:
+        description: Automatically create groups from host variables.
+        type: bool
+        default: true
 
 extends_documentation_fragment:
 - inventory_cache
@@ -110,7 +119,7 @@ extends_documentation_fragment:
 EXAMPLES = '''
 # file must be named openstack.yaml or openstack.yml
 # Make the plugin behave like the default behavior of the old script
-plugin: openstack
+plugin: openstack.cloud.openstack
 expand_hostvars: yes
 fail_on_errors: yes
 all_projects: yes
@@ -118,9 +127,14 @@ all_projects: yes
 
 import collections
 import sys
+import logging
 
 from ansible.errors import AnsibleParserError
 from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable
+from ansible.utils.display import Display
+
+display = Display()
+os_logger = logging.getLogger("openstack")
 
 try:
     # Due to the name shadowing we should import other way
@@ -128,8 +142,10 @@ try:
     sdk = importlib.import_module('openstack')
     sdk_inventory = importlib.import_module('openstack.cloud.inventory')
     client_config = importlib.import_module('openstack.config.loader')
+    sdk_exceptions = importlib.import_module("openstack.exceptions")
     HAS_SDK = True
 except ImportError:
+    display.vvvv("Couldn't import Openstack SDK modules")
     HAS_SDK = False
 
 
@@ -150,7 +166,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
         msg = ''
         if not self._config_data:
             msg = 'File empty. this is not my config file'
-        elif 'plugin' in self._config_data and self._config_data['plugin'] != self.NAME:
+        elif 'plugin' in self._config_data and self._config_data['plugin'] not in (self.NAME, 'openstack'):
             msg = 'plugin config file, but not for us: %s' % self._config_data['plugin']
         elif 'plugin' not in self._config_data and 'clouds' not in self._config_data:
             msg = "it's not a plugin configuration nor a clouds.yaml file"
@@ -158,11 +174,14 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
             msg = "openstacksdk is required for the OpenStack inventory plugin. OpenStack inventory sources will be skipped."
 
         if msg:
+            display.vvvv(msg)
             raise AnsibleParserError(msg)
 
-        # The user has pointed us at a clouds.yaml file. Use defaults for
-        # everything.
         if 'clouds' in self._config_data:
+            self.display.vvvv(
+                "Found clouds config file instead of plugin config. "
+                "Using default configuration."
+            )
             self._config_data = {}
 
         # update cache if the user has caching enabled and the cache is being refreshed
@@ -173,13 +192,16 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
             cache = self.get_option('cache')
         source_data = None
         if cache:
+            self.display.vvvv("Reading inventory data from cache: %s" % cache_key)
             try:
                 source_data = self._cache[cache_key]
             except KeyError:
                 # cache expired or doesn't exist yet
+                display.vvvv("Inventory data cache not found")
                 cache_needs_update = True
 
         if not source_data:
+            self.display.vvvv("Getting hosts from Openstack clouds")
             clouds_yaml_path = self._config_data.get('clouds_yaml_path')
             if clouds_yaml_path:
                 config_files = (
@@ -192,11 +214,16 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
             # Redict logging to stderr so it does not mix with output
             # particular ansible-inventory JSON output
             # TODO(mordred) Integrate openstack's logging with ansible's logging
-            sdk.enable_logging(stream=sys.stderr)
+            if self.display.verbosity > 3:
+                sdk.enable_logging(debug=True, stream=sys.stderr)
+            else:
+                sdk.enable_logging(stream=sys.stderr)
 
             cloud_inventory = sdk_inventory.OpenStackInventory(
                 config_files=config_files,
                 private=self._config_data.get('private', False))
+            self.display.vvvv("Found %d cloud(s) in Openstack" %
+                              len(cloud_inventory.clouds))
             only_clouds = self._config_data.get('only_clouds', [])
             if only_clouds and not isinstance(only_clouds, list):
                 raise ValueError(
@@ -205,20 +232,32 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
             if only_clouds:
                 new_clouds = []
                 for cloud in cloud_inventory.clouds:
+                    self.display.vvvv("Looking at cloud : %s" % cloud.name)
                     if cloud.name in only_clouds:
+                        self.display.vvvv("Selecting cloud : %s" % cloud.name)
                         new_clouds.append(cloud)
                 cloud_inventory.clouds = new_clouds
 
+            self.display.vvvv("Selected %d cloud(s)" %
+                              len(cloud_inventory.clouds))
+
             expand_hostvars = self._config_data.get('expand_hostvars', False)
             fail_on_errors = self._config_data.get('fail_on_errors', False)
             all_projects = self._config_data.get('all_projects', False)
+            self.use_names = self._config_data.get('use_names', False)
 
-            source_data = cloud_inventory.list_hosts(
+            source_data = []
-                expand=expand_hostvars, fail_on_cloud_config=fail_on_errors,
+            try:
-                all_projects=all_projects)
+                source_data = cloud_inventory.list_hosts(
-
+                    expand=expand_hostvars, fail_on_cloud_config=fail_on_errors,
-            if cache_needs_update:
+                    all_projects=all_projects)
-                self._cache[cache_key] = source_data
+            except Exception as e:
+                self.display.warning("Couldn't list Openstack hosts. "
+                                     "See logs for details")
+                os_logger.error(e.message)
+            finally:
+                if cache_needs_update:
+                    self._cache[cache_key] = source_data
 
         self._populate_from_source(source_data)
 
@@ -280,7 +319,11 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
         for group_name, group_hosts in groups.items():
             gname = self.inventory.add_group(group_name)
             for host in group_hosts:
-                self.inventory.add_child(gname, host)
+                if gname == host:
+                    display.vvvv("Same name for host %s and group %s" % (host, gname))
+                    self.inventory.add_host(host, gname)
+                else:
+                    self.inventory.add_child(gname, host)
 
     def _get_groups_from_server(self, server_vars, namegroup=True):
         groups = []
@@ -328,14 +371,25 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
 
     def _append_hostvars(self, hostvars, groups, current_host,
                          server, namegroup=False):
-        hostvars[current_host] = dict(
+        if not self.use_names:
-            ansible_ssh_host=server['interface_ip'],
+            hostvars[current_host] = dict(
-            ansible_host=server['interface_ip'],
+                ansible_ssh_host=server['interface_ip'],
-            openstack=server)
+                ansible_host=server['interface_ip'],
+                openstack=server,
+            )
+
+        if self.use_names:
+            hostvars[current_host] = dict(
+                ansible_ssh_host=server['name'],
+                ansible_host=server['name'],
+                openstack=server,
+            )
+
         self.inventory.add_host(current_host)
 
-        for group in self._get_groups_from_server(server, namegroup=namegroup):
+        if self.get_option('legacy_groups'):
-            groups[group].append(current_host)
+            for group in self._get_groups_from_server(server, namegroup=namegroup):
+                groups[group].append(current_host)
 
     def verify_file(self, path):
 
@@ -344,5 +398,6 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
                 for suffix in ('yaml', 'yml'):
                     maybe = '{fn}.{suffix}'.format(fn=fn, suffix=suffix)
                     if path.endswith(maybe):
+                        self.display.vvvv("Valid plugin config file found")
                         return True
         return False

plugins/module_utils/ironic.py

@@ -0,0 +1,68 @@
+# This code is part of Ansible, but is an independent component.
+# This particular file snippet, and this file snippet only, is BSD licensed.
+# Modules you write using this snippet, which is embedded dynamically by Ansible
+# still belong to the author of the module, and may assign their own license
+# to the complete work.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+#    * Redistributions of source code must retain the above copyright
+#      notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above copyright notice,
+#      this list of conditions and the following disclaimer in the documentation
+#      and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+
+
+def ironic_argument_spec(**kwargs):
+    spec = dict(
+        auth_type=dict(required=False),
+        ironic_url=dict(required=False),
+    )
+    spec.update(kwargs)
+    return openstack_full_argument_spec(**spec)
+
+
+# TODO(dtantsur): inherit the collection's base module
+class IronicModule(AnsibleModule):
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._update_ironic_auth()
+
+    def _update_ironic_auth(self):
+        """Validate and update authentication parameters for ironic."""
+        if (
+            self.params['auth_type'] in [None, 'None', 'none']
+            and self.params['ironic_url'] is None
+            and not self.params['cloud']
+            and not (self.params['auth']
+                     and self.params['auth'].get('endpoint'))
+        ):
+            self.fail_json(msg=("Authentication appears to be disabled, "
+                                "Please define either ironic_url, or cloud, "
+                                "or auth.endpoint"))
+
+        if (
+            self.params['ironic_url']
+            and self.params['auth_type'] in [None, 'None', 'none']
+            and not (self.params['auth']
+                     and self.params['auth'].get('endpoint'))
+        ):
+            self.params['auth'] = dict(
+                endpoint=self.params['ironic_url']
+            )

plugins/module_utils/openstack.py

@@ -28,6 +28,7 @@
 # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import abc
+import copy
 from distutils.version import StrictVersion
 import importlib
 import os
@@ -35,6 +36,39 @@ import os
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.six import iteritems
 
+OVERRIDES = {'os_client_config': 'config',
+             'os_endpoint': 'catalog_endpoint',
+             'os_flavor': 'compute_flavor',
+             'os_flavor_info': 'compute_flavor_info',
+             'os_group': 'identity_group',
+             'os_group_info': 'identity_group_info',
+             'os_ironic': 'baremetal_node',
+             'os_ironic_inspect': 'baremetal_inspect',
+             'os_ironic_node': 'baremetal_node_action',
+             'os_keystone_domain': 'identity_domain',
+             'os_keystone_domain_info': 'identity_domain_info',
+             'os_keystone_endpoint': 'endpoint',
+             'os_keystone_identity_provider': 'federation_idp',
+             'os_keystone_identity_provider_info': 'federation_idp_info',
+             'os_keystone_mapping': 'federation_mapping',
+             'os_keystone_mapping_info': 'federation_mapping_info',
+             'os_keystone_role': 'identity_role',
+             'os_keystone_service': 'catalog_service',
+             'os_listener': 'lb_listener',
+             'os_member': 'lb_member',
+             'os_nova_flavor': 'compute_flavor',
+             'os_nova_host_aggregate': 'host_aggregate',
+             'os_pool': 'lb_pool',
+             'os_user': 'identity_user',
+             'os_user_group': 'group_assignment',
+             'os_user_info': 'identity_user_info',
+             'os_user_role': 'role_assignment',
+             'os_zone': 'dns_zone'}
+
+CUSTOM_VAR_PARAMS = ['min_ver', 'max_ver']
+
+MINIMUM_SDK_VERSION = '0.12.0'
+
 
 def openstack_argument_spec():
     # DEPRECATED: This argument spec is only used for the deprecated old
@@ -97,7 +131,12 @@ def openstack_full_argument_spec(**kwargs):
             default='public', choices=['public', 'internal', 'admin'],
             aliases=['endpoint_type']),
     )
-    spec.update(kwargs)
+    # Filter out all our custom parameters before passing to AnsibleModule
+    kwargs_copy = copy.deepcopy(kwargs)
+    for v in kwargs_copy.values():
+        for c in CUSTOM_VAR_PARAMS:
+            v.pop(c, None)
+    spec.update(kwargs_copy)
     return spec
 
 
@@ -109,11 +148,11 @@ def openstack_module_kwargs(**kwargs):
                 ret[key].extend(kwargs[key])
             else:
                 ret[key] = kwargs[key]
-
     return ret
 
 
-def openstack_cloud_from_module(module, min_version='0.12.0'):
+# for compatibility with old versions
+def openstack_cloud_from_module(module, min_version=None):
     try:
         # Due to the name shadowing we should import other way
         sdk = importlib.import_module('openstack')
@@ -122,9 +161,10 @@ def openstack_cloud_from_module(module, min_version='0.12.0'):
         module.fail_json(msg='openstacksdk is required for this module')
 
     if min_version:
-        min_version = max(StrictVersion('0.12.0'), StrictVersion(min_version))
+        min_version = max(StrictVersion(MINIMUM_SDK_VERSION),
+                          StrictVersion(min_version))
     else:
-        min_version = StrictVersion('0.12.0')
+        min_version = StrictVersion(MINIMUM_SDK_VERSION)
 
     if StrictVersion(sdk_version.__version__) < min_version:
         module.fail_json(
@@ -166,25 +206,217 @@ def openstack_cloud_from_module(module, min_version='0.12.0'):
         module.fail_json(msg=str(e))
 
 
-class OpenStackModule(AnsibleModule):
+class OpenStackModule:
+    """Openstack Module is a base class for all Openstack Module classes.
 
+    The class has `run` function that should be overriden in child classes,
+    the provided methods include:
+
+    Methods:
+        params: Dictionary of Ansible module parameters.
+        module_name: Module name (i.e. server_action)
+        sdk_version: Version of used OpenstackSDK.
+        results: Dictionary for return of Ansible module,
+                 must include `changed` keyword.
+        exit, exit_json: Exit module and return data inside, must include
+                         changed` keyword in a data.
+        fail, fail_json: Exit module with failure, has `msg` keyword to
+                         specify a reason of failure.
+        conn: Connection to SDK object.
+        log: Print message to system log.
+        debug: Print debug message to system log, prints if Ansible Debug is
+               enabled or verbosity is more than 2.
+        check_deprecated_names: Function that checks if module was called with
+                                a deprecated name and prints the correct name
+                                with deprecation warning.
+        check_versioned: helper function to check that all arguments are known
+                         in the current SDK version.
+        run: method that executes and shall be overriden in inherited classes.
+
+    Args:
+        deprecated_names: Should specify deprecated modules names for current
+                          module.
+        argument_spec: Used for construction of Openstack common arguments.
+        module_kwargs: Additional arguments for Ansible Module.
+    """
+
+    deprecated_names = ()
     argument_spec = {}
     module_kwargs = {}
+    module_min_sdk_version = None
 
     def __init__(self):
+        """Initialize Openstack base class.
 
-        super(OpenStackModule, self).__init__(
+        Set up variables, connection to SDK and check if there are
+        deprecated names.
+        """
+        self.ansible = AnsibleModule(
             openstack_full_argument_spec(**self.argument_spec),
             **self.module_kwargs)
+        self.params = self.ansible.params
+        self.module_name = self.ansible._name
+        self.check_mode = self.ansible.check_mode
+        self.sdk_version = None
+        self.results = {'changed': False}
+        self.exit = self.exit_json = self.ansible.exit_json
+        self.fail = self.fail_json = self.ansible.fail_json
+        self.warn = self.ansible.warn
+        self.sdk, self.conn = self.openstack_cloud_from_module()
+        self.check_deprecated_names()
 
-        self.sdk, self.conn = openstack_cloud_from_module(self)
+    def log(self, msg):
+        """Prints log message to system log.
+
+        Arguments:
+            msg {str} -- Log message
+        """
+        self.ansible.log(msg)
+
+    def debug(self, msg):
+        """Prints debug message to system log
+
+        Arguments:
+            msg {str} -- Debug message.
+        """
+        if self.ansible._debug or self.ansible._verbosity > 2:
+            self.ansible.log(
+                " ".join(['[DEBUG]', msg]))
+
+    def check_deprecated_names(self):
+        """Check deprecated module names if `deprecated_names` variable is set.
+        """
+        new_module_name = OVERRIDES.get(self.module_name)
+        if self.module_name in self.deprecated_names and new_module_name:
+            self.ansible.deprecate(
+                "The '%s' module has been renamed to '%s' in openstack "
+                "collection: openstack.cloud.%s" % (
+                    self.module_name, new_module_name, new_module_name),
+                version='2.0.0', collection_name='openstack.cloud')
+
+    def openstack_cloud_from_module(self):
+        """Sets up connection to cloud using provided options. Checks if all
+           provided variables are supported for the used SDK version.
+        """
+        try:
+            # Due to the name shadowing we should import other way
+            sdk = importlib.import_module('openstack')
+            sdk_version_lib = importlib.import_module('openstack.version')
+            self.sdk_version = sdk_version_lib.__version__
+        except ImportError:
+            self.fail_json(msg='openstacksdk is required for this module')
+
+        # Fail if the available SDK version doesn't meet the minimum version
+        # requirements
+        if self.module_min_sdk_version:
+            min_version = max(StrictVersion(MINIMUM_SDK_VERSION),
+                              StrictVersion(self.module_min_sdk_version))
+        else:
+            min_version = StrictVersion(MINIMUM_SDK_VERSION)
+        if StrictVersion(self.sdk_version) < min_version:
+            self.fail(
+                msg="To utilize this module, the installed version of "
+                "the openstacksdk library MUST be >={min_version}.".format(
+                    min_version=min_version))
+
+        # Fail if there are set unsupported for this version parameters
+        # New parameters should NOT use 'default' but rely on SDK defaults
+        for param in self.argument_spec:
+            if (self.params[param] is not None
+                and 'min_ver' in self.argument_spec[param]
+                    and StrictVersion(self.sdk_version) < self.argument_spec[param]['min_ver']):
+                self.fail_json(
+                    msg="To use parameter '{param}' with module '{module}', the installed version of "
+                    "the openstacksdk library MUST be >={min_version}.".format(
+                        min_version=self.argument_spec[param]['min_ver'],
+                        param=param,
+                        module=self.module_name))
+            if (self.params[param] is not None
+                and 'max_ver' in self.argument_spec[param]
+                    and StrictVersion(self.sdk_version) > self.argument_spec[param]['max_ver']):
+                self.fail_json(
+                    msg="To use parameter '{param}' with module '{module}', the installed version of "
+                    "the openstacksdk library MUST be <={max_version}.".format(
+                        max_version=self.argument_spec[param]['max_ver'],
+                        param=param,
+                        module=self.module_name))
+
+        cloud_config = self.params.pop('cloud', None)
+        if isinstance(cloud_config, dict):
+            fail_message = (
+                "A cloud config dict was provided to the cloud parameter"
+                " but also a value was provided for {param}. If a cloud"
+                " config dict is provided, {param} should be"
+                " excluded.")
+            for param in (
+                    'auth', 'region_name', 'validate_certs',
+                    'ca_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
+            if self.params['interface'] != 'public':
+                self.fail_json(msg=fail_message.format(param='interface'))
+        else:
+            cloud_config = dict(
+                cloud=cloud_config,
+                auth_type=self.params['auth_type'],
+                auth=self.params['auth'],
+                region_name=self.params['region_name'],
+                verify=self.params['validate_certs'],
+                cacert=self.params['ca_cert'],
+                key=self.params['client_key'],
+                api_timeout=self.params['api_timeout'],
+                interface=self.params['interface'],
+            )
+        try:
+            return sdk, sdk.connect(**cloud_config)
+        except sdk.exceptions.SDKException as e:
+            # Probably a cloud configuration/login error
+            self.fail_json(msg=str(e))
+
+    # Filter out all arguments that are not from current SDK version
+    def check_versioned(self, **kwargs):
+        """Check that provided arguments are supported by current SDK version
+
+        Returns:
+            versioned_result {dict} dictionary of only arguments that are
+                                    supported by current SDK version. All others
+                                    are dropped.
+        """
+        versioned_result = {}
+        for var_name in kwargs:
+            if ('min_ver' in self.argument_spec[var_name]
+                    and StrictVersion(self.sdk_version) < self.argument_spec[var_name]['min_ver']):
+                continue
+            if ('max_ver' in self.argument_spec[var_name]
+                    and StrictVersion(self.sdk_version) > self.argument_spec[var_name]['max_ver']):
+                continue
+            versioned_result.update({var_name: kwargs[var_name]})
+        return versioned_result
 
     @abc.abstractmethod
     def run(self):
+        """Function for overriding in inhetired classes, it's executed by default.
+        """
         pass
 
     def __call__(self):
+        """Execute `run` function when calling the class.
+        """
         try:
-            self.run()
+            results = self.run()
+            if results and isinstance(results, dict):
+                self.ansible.exit_json(**results)
         except self.sdk.exceptions.OpenStackCloudException as e:
-            self.fail_json(msg=str(e), extra_data=e.extra_data)
+            params = {
+                'msg': str(e),
+                'extra_data': {
+                    'data': getattr(e, 'extra_data', 'None'),
+                    'details': getattr(e, 'details', 'None'),
+                    'response': getattr(getattr(e, 'response', ''),
+                                        'text', 'None')
+                }
+            }
+            self.ansible.fail_json(**params)
+        # if we got to this place, modules didn't exit
+        self.ansible.exit_json(**self.results)

plugins/modules/address_scope.py

@@ -0,0 +1,201 @@
+#!/usr/bin/python
+# coding: utf-8 -*-
+#
+# Copyright (c) 2021 by Uemit Seren <uemit.seren@gmail.com>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+DOCUMENTATION = '''
+---
+module: address_scope
+short_description: Create or delete address scopes from OpenStack
+author: OpenStack Ansible SIG
+description:
+   - Create or Delete address scopes from OpenStack.
+options:
+   state:
+     description:
+        - Indicate desired state of the resource
+     choices: ['present', 'absent']
+     default: present
+     type: str
+   name:
+     description:
+        - Name to be give to the address scope
+     required: true
+     type: str
+   project:
+     description:
+        - Unique name or ID of the project.
+     type: str
+   ip_version:
+     description:
+        - The IP version of the subnet 4 or 6
+     default: 4
+     type: str
+     choices: ['4', '6']
+   shared:
+     description:
+        - Whether this address scope is shared or not.
+     type: bool
+     default: 'no'
+   extra_specs:
+     description:
+        - Dictionary with extra key/value pairs passed to the API
+     required: false
+     default: {}
+     type: dict
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
+
+extends_documentation_fragment:
+- openstack.cloud.openstack
+'''
+
+EXAMPLES = '''
+# Create an IPv4 address scope.
+- openstack.cloud.address_scope:
+    cloud: mycloud
+    state: present
+    name: my_adress_scope
+
+# Create a shared IPv6 address scope for a given project.
+- openstack.cloud.address_scope:
+    cloud: mycloud
+    state: present
+    ip_version: 6
+    name: ipv6_address_scope
+    project: myproj
+
+# Delete address scope.
+- openstack.cloud.address_scope:
+    cloud: mycloud
+    state: absent
+    name: my_adress_scope
+'''
+
+RETURN = '''
+address_scope:
+    description: Dictionary describing the address scope.
+    returned: On success when I(state) is 'present'
+    type: complex
+    contains:
+        id:
+            description: Address Scope ID.
+            type: str
+            sample: "474acfe5-be34-494c-b339-50f06aa143e4"
+        name:
+            description: Address Scope name.
+            type: str
+            sample: "my_address_scope"
+        tenant_id:
+            description: The tenant ID.
+            type: str
+            sample: "861174b82b43463c9edc5202aadc60ef"
+        ip_version:
+            description: The IP version of the subnet 4 or 6.
+            type: str
+            sample: "4"
+        is_shared:
+            description: Indicates whether this address scope is shared across all tenants.
+            type: bool
+            sample: false
+
+'''
+
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
+
+
+class AddressScopeModule(OpenStackModule):
+    argument_spec = dict(
+        state=dict(default='present', choices=['absent', 'present']),
+        name=dict(required=True),
+        shared=dict(default=False, type='bool'),
+        ip_version=dict(type='str', default='4', choices=['4', '6']),
+        project=dict(default=None),
+        extra_specs=dict(type='dict', default=dict())
+    )
+
+    def _needs_update(self, address_scope, filters=None):
+        """Decide if the given address_scope needs an update.
+        """
+        ip_version = int(self.params['ip_version'])
+        if address_scope['is_shared'] != self.params['shared']:
+            return True
+        if ip_version and address_scope['ip_version'] != ip_version:
+            self.fail_json(msg='Cannot update ip_version in existing address scope')
+        return False
+
+    def _system_state_change(self, address_scope, filters=None):
+        """Check if the system state would be changed."""
+        state = self.params['state']
+        if state == 'absent' and address_scope:
+            return True
+        if state == 'present':
+            if not address_scope:
+                return True
+            return self._needs_update(address_scope, filters)
+        return False
+
+    def run(self):
+
+        state = self.params['state']
+        name = self.params['name']
+        shared = self.params['shared']
+        ip_version = self.params['ip_version']
+        project = self.params['project']
+        extra_specs = self.params['extra_specs']
+
+        if project is not None:
+            proj = self.conn.get_project(project)
+            if proj is None:
+                self.fail(msg='Project %s could not be found' % project)
+            project_id = proj['id']
+        else:
+            project_id = self.conn.current_project_id
+
+        address_scope = self.conn.network.find_address_scope(name_or_id=name)
+        if self.ansible.check_mode:
+            self.exit_json(
+                changed=self._system_state_change(address_scope)
+            )
+
+        if state == 'present':
+            changed = False
+
+            if not address_scope:
+                kwargs = dict(
+                    name=name,
+                    ip_version=ip_version,
+                    is_shared=shared,
+                    tenant_id=project_id)
+                dup_args = set(kwargs.keys()) & set(extra_specs.keys())
+                if dup_args:
+                    raise ValueError('Duplicate key(s) {0} in extra_specs'
+                                     .format(list(dup_args)))
+                kwargs = dict(kwargs, **extra_specs)
+                address_scope = self.conn.network.create_address_scope(**kwargs)
+                changed = True
+            else:
+                if self._needs_update(address_scope):
+                    address_scope = self.conn.network.update_address_scope(address_scope['id'], is_shared=shared)
+                    changed = True
+                else:
+                    changed = False
+            self.exit_json(changed=changed, address_scope=address_scope, id=address_scope['id'])
+
+        elif state == 'absent':
+            if not address_scope:
+                self.exit(changed=False)
+            else:
+                self.conn.network.delete_address_scope(address_scope['id'])
+                self.exit_json(changed=True)
+
+
+def main():
+    module = AddressScopeModule()
+    module()
+
+
+if __name__ == '__main__':
+    main()

plugins/modules/auth.py

@@ -7,7 +7,7 @@ DOCUMENTATION = '''
 ---
 module: auth
 short_description: Retrieve an auth token
-author: "Monty Taylor (@emonty)"
+author: OpenStack Ansible SIG
 description:
     - Retrieve an auth token from an OpenStack Cloud
 requirements:
@@ -38,29 +38,24 @@ service_catalog:
     type: dict
 '''
 
-import traceback
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
 
-from ansible.module_utils.basic import AnsibleModule
+
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
+class AuthModule(OpenStackModule):
-                                                                                openstack_module_kwargs,
+    argument_spec = dict()
-                                                                                openstack_cloud_from_module)
+    module_kwargs = dict()
+
+    def run(self):
+        self.exit_json(
+            changed=False,
+            ansible_facts=dict(
+                auth_token=self.conn.auth_token,
+                service_catalog=self.conn.service_catalog))
 
 
 def main():
-
+    module = AuthModule()
-    argument_spec = openstack_full_argument_spec()
+    module()
-    module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(argument_spec, **module_kwargs)
-
-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
-        module.exit_json(
-            changed=False,
-            ansible_facts=dict(
-                auth_token=cloud.auth_token,
-                service_catalog=cloud.service_catalog))
-    except Exception as e:
-        module.fail_json(msg=str(e), exception=traceback.format_exc())
 
 
 if __name__ == '__main__':

plugins/modules/baremetal_inspect.py

@@ -8,7 +8,7 @@ DOCUMENTATION = '''
 ---
 module: baremetal_inspect
 short_description: Explicitly triggers baremetal node introspection in ironic.
-author: "Julia Kreger (@juliakreger)"
+author: OpenStack Ansible SIG
 description:
     - Requests Ironic to set a node into inspect state in order to collect metadata regarding the node.
       This command may be out of band or in-band depending on the ironic driver configuration.
@@ -75,10 +75,14 @@ EXAMPLES = '''
     name: "testnode1"
 '''
 
-from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.openstack.cloud.plugins.module_utils.ironic import (
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
+    IronicModule,
-                                                                                openstack_module_kwargs,
+    ironic_argument_spec,
-                                                                                openstack_cloud_from_module)
+)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (
+    openstack_module_kwargs,
+    openstack_cloud_from_module
+)
 
 
 def _choose_id_value(module):
@@ -90,31 +94,14 @@ def _choose_id_value(module):
 
 
 def main():
-    argument_spec = openstack_full_argument_spec(
+    argument_spec = ironic_argument_spec(
-        auth_type=dict(required=False),
         uuid=dict(required=False),
         name=dict(required=False),
         mac=dict(required=False),
-        ironic_url=dict(required=False),
         timeout=dict(default=1200, type='int', required=False),
     )
     module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(argument_spec, **module_kwargs)
+    module = IronicModule(argument_spec, **module_kwargs)
-
-    if (
-        module.params['auth_type'] in [None, 'None']
-        and module.params['ironic_url'] is None
-    ):
-        module.fail_json(msg="Authentication appears to be disabled, "
-                             "Please define an ironic_url parameter")
-
-    if (
-        module.params['ironic_url']
-        and module.params['auth_type'] in [None, 'None']
-    ):
-        module.params['auth'] = dict(
-            endpoint=module.params['ironic_url']
-        )
 
     sdk, cloud = openstack_cloud_from_module(module)
     try:

plugins/modules/baremetal_node.py

@@ -8,7 +8,7 @@ DOCUMENTATION = '''
 ---
 module: baremetal_node
 short_description: Create/Delete Bare Metal Resources from OpenStack
-author: "Monty Taylor (@emonty)"
+author: OpenStack Ansible SIG
 description:
     - Create or Remove Ironic nodes from OpenStack.
 options:
@@ -43,29 +43,71 @@ options:
           endpoint URL for the Ironic API.  Use with "auth" and "auth_type"
           settings set to None.
       type: str
+    resource_class:
+      description:
+        - The specific resource type to which this node belongs.
+      type: str
+    bios_interface:
+      description:
+        - The bios interface for this node, e.g. "no-bios".
+      type: str
+    boot_interface:
+      description:
+        - The boot interface for this node, e.g. "pxe".
+      type: str
+    console_interface:
+      description:
+        - The console interface for this node, e.g. "no-console".
+      type: str
+    deploy_interface:
+      description:
+        - The deploy interface for this node, e.g. "iscsi".
+      type: str
+    inspect_interface:
+      description:
+        - The interface used for node inspection, e.g. "no-inspect".
+      type: str
+    management_interface:
+      description:
+        - The interface for out-of-band management of this node, e.g.
+          "ipmitool".
+      type: str
+    network_interface:
+      description:
+        - The network interface provider to use when describing
+          connections for this node.
+      type: str
+    power_interface:
+      description:
+        - The interface used to manage power actions on this node, e.g.
+          "ipmitool".
+      type: str
+    raid_interface:
+      description:
+        - Interface used for configuring raid on this node.
+      type: str
+    rescue_interface:
+      description:
+        - Interface used for node rescue, e.g. "no-rescue".
+      type: str
+    storage_interface:
+      description:
+        - Interface used for attaching and detaching volumes on this node, e.g.
+          "cinder".
+      type: str
+    vendor_interface:
+      description:
+        - Interface for all vendor-specific actions on this node, e.g.
+          "no-vendor".
+      type: str
     driver_info:
       description:
         - Information for this server's driver. Will vary based on which
           driver is in use. Any sub-field which is populated will be validated
-          during creation.
+          during creation. For compatibility reasons sub-fields `power`,
+          `deploy`, `management` and `console` are flattened.
       required: true
       type: dict
-      suboptions:
-        power:
-            description:
-                - Information necessary to turn this server on / off.
-                  This often includes such things as IPMI username, password, and IP address.
-            required: true
-        deploy:
-            description:
-                - Information necessary to deploy this server directly, without using Nova. THIS IS NOT RECOMMENDED.
-        console:
-            description:
-                - Information necessary to connect to this server's serial console.  Not all drivers support this.
-        management:
-            description:
-                - Information necessary to interact with this server's management interface. May be shared by power_info in some cases.
-            required: true
     nics:
       description:
         - 'A list of network interface cards, eg, " - mac: aa:bb:cc:aa:bb:cc"'
@@ -118,10 +160,10 @@ options:
         - As of Kilo, by default, passwords are always masked to API
           requests, which means the logic as a result always attempts to
           re-assert the password field.
-        - C(skip_update_of_driver_password) is deprecated alias and will be removed in 2.14.
+        - C(skip_update_of_driver_password) is deprecated alias and will be removed in openstack.cloud 2.0.0.
       type: bool
-      default: 'no'
+      aliases:
-      aliases: [ skip_update_of_driver_password ]
+        - skip_update_of_driver_password
 requirements:
     - "python >= 3.6"
     - "openstacksdk"
@@ -149,10 +191,9 @@ EXAMPLES = '''
       - mac: "aa:bb:cc:aa:bb:cc"
       - mac: "dd:ee:ff:dd:ee:ff"
     driver_info:
-      power:
+      ipmi_address: "1.2.3.4"
-        ipmi_address: "1.2.3.4"
+      ipmi_username: "admin"
-        ipmi_username: "admin"
+      ipmi_password: "adminpass"
-        ipmi_password: "adminpass"
     chassis_uuid: "00000000-0000-0000-0000-000000000001"
 
 '''
@@ -163,37 +204,46 @@ try:
 except ImportError:
     HAS_JSONPATCH = False
 
-from ansible.module_utils.basic import AnsibleModule
+
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
+from ansible_collections.openstack.cloud.plugins.module_utils.ironic import (
-                                                                                openstack_module_kwargs,
+    IronicModule,
-                                                                                openstack_cloud_from_module)
+    ironic_argument_spec,
+)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (
+    openstack_module_kwargs,
+    openstack_cloud_from_module
+)
+
+
+_PROPERTIES = {
+    'cpu_arch': 'cpu_arch',
+    'cpus': 'cpus',
+    'ram': 'memory_mb',
+    'disk_size': 'local_gb',
+    'capabilities': 'capabilities',
+    'root_device': 'root_device',
+}
 
 
 def _parse_properties(module):
+    """Convert ansible properties into native ironic values.
+
+    Also filter out any properties that are not set.
+    """
     p = module.params['properties']
-    props = dict(
+    return {to_key: p[from_key] for (from_key, to_key) in _PROPERTIES.items()
-        cpu_arch=p.get('cpu_arch') if p.get('cpu_arch') else 'x86_64',
+            if p.get(from_key) is not None}
-        cpus=p.get('cpus') if p.get('cpus') else 1,
-        memory_mb=p.get('ram') if p.get('ram') else 1,
-        local_gb=p.get('disk_size') if p.get('disk_size') else 1,
-        capabilities=p.get('capabilities') if p.get('capabilities') else '',
-        root_device=p.get('root_device') if p.get('root_device') else '',
-    )
-    return props
 
 
 def _parse_driver_info(sdk, module):
-    p = module.params['driver_info']
+    info = module.params['driver_info'].copy()
-    info = p.get('power')
+    for deprecated in ('power', 'console', 'management', 'deploy'):
-    if not info:
+        if deprecated in info:
-        raise sdk.exceptions.OpenStackCloudException(
+            info.update(info.pop(deprecated))
-            "driver_info['power'] is required")
+            module.deprecate("Suboption %s of the driver_info parameter of "
-    if p.get('console'):
+                             "'openstack.cloud.baremetal_node' is deprecated"
-        info.update(p.get('console'))
+                             % deprecated, version='2.0.0',
-    if p.get('management'):
+                             collection_name='openstack.cloud')
-        info.update(p.get('management'))
-    if p.get('deploy'):
-        info.update(p.get('deploy'))
     return info
 
 
@@ -224,42 +274,43 @@ def _exit_node_not_updated(module, server):
 
 
 def main():
-    argument_spec = openstack_full_argument_spec(
+    argument_spec = ironic_argument_spec(
         uuid=dict(required=False),
         name=dict(required=False),
         driver=dict(required=False),
+        resource_class=dict(required=False),
+        bios_interface=dict(required=False),
+        boot_interface=dict(required=False),
+        console_interface=dict(required=False),
+        deploy_interface=dict(required=False),
+        inspect_interface=dict(required=False),
+        management_interface=dict(required=False),
+        network_interface=dict(required=False),
+        power_interface=dict(required=False),
+        raid_interface=dict(required=False),
+        rescue_interface=dict(required=False),
+        storage_interface=dict(required=False),
+        vendor_interface=dict(required=False),
         driver_info=dict(type='dict', required=True),
         nics=dict(type='list', required=True, elements="dict"),
         properties=dict(type='dict', default={}),
-        ironic_url=dict(required=False),
         chassis_uuid=dict(required=False),
         skip_update_of_masked_password=dict(
             required=False,
             type='bool',
             aliases=['skip_update_of_driver_password'],
-            deprecated_aliases=[dict(name='skip_update_of_driver_password', version='2.14')]
+            deprecated_aliases=[dict(
+                name='skip_update_of_driver_password',
+                version='2.0.0',
+                collection_name='openstack.cloud')]
         ),
         state=dict(required=False, default='present', choices=['present', 'absent'])
     )
     module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(argument_spec, **module_kwargs)
+    module = IronicModule(argument_spec, **module_kwargs)
 
     if not HAS_JSONPATCH:
         module.fail_json(msg='jsonpatch is required for this module')
-    if (
-        module.params['auth_type'] in [None, 'None']
-        and module.params['ironic_url'] is None
-    ):
-        module.fail_json(msg="Authentication appears to be disabled, "
-                             "Please define an ironic_url parameter")
-
-    if (
-        module.params['ironic_url']
-        and module.params['auth_type'] in [None, 'None']
-    ):
-        module.params['auth'] = dict(
-            endpoint=module.params['ironic_url']
-        )
 
     node_id = _choose_id_value(module)
 
@@ -279,6 +330,22 @@ def main():
                 driver_info=driver_info,
                 name=module.params['name'],
             )
+            optional_field_names = ('resource_class',
+                                    'bios_interface',
+                                    'boot_interface',
+                                    'console_interface',
+                                    'deploy_interface',
+                                    'inspect_interface',
+                                    'management_interface',
+                                    'network_interface',
+                                    'power_interface',
+                                    'raid_interface',
+                                    'rescue_interface',
+                                    'storage_interface',
+                                    'vendor_interface')
+            for i in optional_field_names:
+                if module.params[i]:
+                    kwargs[i] = module.params[i]
 
             if module.params['chassis_uuid']:
                 kwargs['chassis_uuid'] = module.params['chassis_uuid']

plugins/modules/baremetal_node_action.py

@@ -8,7 +8,7 @@ DOCUMENTATION = '''
 ---
 module: baremetal_node_action
 short_description: Activate/Deactivate Bare Metal Resources from OpenStack
-author: "Monty Taylor (@emonty)"
+author: OpenStack Ansible SIG
 description:
     - Deploy to nodes controlled by Ironic.
 options:
@@ -132,10 +132,15 @@ EXAMPLES = '''
     delegate_to: localhost
 '''
 
-from ansible.module_utils.basic import AnsibleModule
+
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
+from ansible_collections.openstack.cloud.plugins.module_utils.ironic import (
-                                                                                openstack_module_kwargs,
+    IronicModule,
-                                                                                openstack_cloud_from_module)
+    ironic_argument_spec,
+)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (
+    openstack_module_kwargs,
+    openstack_cloud_from_module
+)
 
 
 def _choose_id_value(module):
@@ -227,12 +232,11 @@ def _check_set_power_state(module, cloud, node):
 
 
 def main():
-    argument_spec = openstack_full_argument_spec(
+    argument_spec = ironic_argument_spec(
         uuid=dict(required=False),
         name=dict(required=False),
         instance_info=dict(type='dict', required=False),
         config_drive=dict(type='raw', required=False),
-        ironic_url=dict(required=False),
         state=dict(required=False, default='present'),
         maintenance=dict(required=False),
         maintenance_reason=dict(required=False),
@@ -242,22 +246,7 @@ def main():
         timeout=dict(required=False, type='int', default=1800),
     )
     module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(argument_spec, **module_kwargs)
+    module = IronicModule(argument_spec, **module_kwargs)
-
-    if (
-        module.params['auth_type'] in [None, 'None']
-        and module.params['ironic_url'] is None
-    ):
-        module.fail_json(msg="Authentication appears disabled, Please "
-                             "define an ironic_url parameter")
-
-    if (
-        module.params['ironic_url']
-        and module.params['auth_type'] in [None, 'None']
-    ):
-        module.params['auth'] = dict(
-            endpoint=module.params['ironic_url']
-        )
 
     if (
         module.params['config_drive']

plugins/modules/baremetal_node_info.py

@@ -0,0 +1,555 @@
+#!/usr/bin/python
+# coding: utf-8 -*-
+
+# Copyright (c) 2021 by Red Hat, Inc.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+
+DOCUMENTATION = '''
+module: baremetal_node_info
+short_description: Retrieve information about Bare Metal nodes from OpenStack
+author: OpenStack Ansible SIG
+description:
+    - Retrieve information about Bare Metal nodes from OpenStack.
+options:
+    node:
+      description:
+        - Name or globally unique identifier (UUID) to identify the host.
+      type: str
+    mac:
+      description:
+        - Unique mac address that is used to attempt to identify the host.
+      type: str
+    ironic_url:
+      description:
+        - If noauth mode is utilized, this is required to be set to the
+          endpoint URL for the Ironic API.  Use with "auth" and "auth_type"
+          settings set to None.
+      type: str
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
+
+extends_documentation_fragment:
+- openstack.cloud.openstack
+'''
+
+EXAMPLES = '''
+# Gather information about all baremeal nodes
+- openstack.cloud.baremetal_node_info:
+    cloud: "devstack"
+  register: result
+- debug:
+    msg: "{{ result.baremetal_nodes }}"
+# Gather information about a baremeal node
+- openstack.cloud.baremetal_node_info:
+    cloud: "devstack"
+    node: "00000000-0000-0000-0000-000000000002"
+  register: result
+- debug:
+    msg: "{{ result.baremetal_nodes }}"
+'''
+
+RETURN = '''
+baremetal_nodes:
+    description: Bare Metal node list. A subset of the dictionary keys
+                 listed below may be returned, depending on your cloud
+                 provider.
+    returned: always, but can be null
+    type: complex
+    contains:
+        allocation_uuid:
+            description: The UUID of the allocation associated with the node.
+                         If not null, will be the same as instance_uuid (the
+                         opposite is not always true). Unlike instance_uuid,
+                         this field is read-only. Please use the Allocation API
+                         to remove allocations.
+            returned: success
+            type: str
+        automated_clean:
+            description: Indicates whether the node will perform automated
+                         clean or not.
+            returned: success
+            type: bool
+        bios_interface:
+            description: The bios interface to be used for this node.
+            returned: success
+            type: str
+        boot_interface:
+            description: The boot interface for a Node, e.g. "pxe".
+            returned: success
+            type: str
+        boot_mode:
+            description: The boot mode for a node, either "uefi" or "bios"
+            returned: success
+            type: str
+        chassis_uuid:
+            description: UUID of the chassis associated with this Node. May be
+                         empty or None.
+            returned: success
+            type: str
+        clean_step:
+            description: The current clean step.
+            returned: success
+            type: str
+        conductor:
+            description: The conductor currently servicing a node. This field
+                         is read-only.
+            returned: success
+            type: str
+        conductor_group:
+            description: The conductor group for a node. Case-insensitive
+                         string up to 255 characters, containing a-z, 0-9, _,
+                         -, and ..
+            returned: success
+            type: str
+        console_enabled:
+            description: Indicates whether console access is enabled or
+                         disabled on this node.
+            returned: success
+            type: bool
+        console_interface:
+            description: The console interface for a node, e.g. "no-console".
+            returned: success
+            type: str
+        created_at:
+            description: Bare Metal node created at timestamp.
+            returned: success
+            type: str
+        deploy_interface:
+            description: The deploy interface for a node, e.g. "direct".
+            returned: success
+            type: str
+        deploy_step:
+            description: The current deploy step.
+            returned: success
+            type: str
+        driver:
+            description: The name of the driver.
+            returned: success
+            type: str
+        driver_info:
+            description: All the metadata required by the driver to manage this
+                         Node. List of fields varies between drivers, and can
+                         be retrieved from the
+                         /v1/drivers/<DRIVER_NAME>/properties resource.
+            returned: success
+            type: dict
+        driver_internal_info:
+            description: Internal metadata set and stored by the Node's driver.
+            returned: success
+            type: dict
+        extra:
+            description: A set of one or more arbitrary metadata key and value
+                         pairs.
+            returned: success
+            type: dict
+        fault:
+            description: The fault indicates the active fault detected by
+                         ironic, typically the Node is in "maintenance mode".
+                         None means no fault has been detected by ironic.
+                         "power failure" indicates ironic failed to retrieve
+                         power state from this node. There are other possible
+                         types, e.g., "clean failure" and "rescue abort
+                         failure".
+            returned: success
+            type: str
+        id:
+            description: The UUID for the resource.
+            returned: success
+            type: str
+        inspect_interface:
+            description: The interface used for node inspection.
+            returned: success
+            type: str
+        instance_info:
+            description: Information used to customize the deployed image. May
+                         include root partition size, a base 64 encoded config
+                         drive, and other metadata. Note that this field is
+                         erased automatically when the instance is deleted
+                         (this is done by requesting the Node provision state
+                         be changed to DELETED).
+            returned: success
+            type: dict
+        instance_uuid:
+            description: UUID of the Nova instance associated with this Node.
+            returned: success
+            type: str
+        last_error:
+            description: Any error from the most recent (last) transaction that
+                         started but failed to finish.
+            returned: success
+            type: str
+        maintenance:
+            description: Whether or not this Node is currently in "maintenance
+                         mode". Setting a Node into maintenance mode removes it
+                         from the available resource pool and halts some
+                         internal automation. This can happen manually (eg, via
+                         an API request) or automatically when Ironic detects a
+                         hardware fault that prevents communication with the
+                         machine.
+            returned: success
+            type: bool
+        maintenance_reason:
+            description: User-settable description of the reason why this Node
+                         was placed into maintenance mode
+            returned: success
+            type: str
+        management_interface:
+            description: Interface for out-of-band node management.
+            returned: success
+            type: str
+        name:
+            description: Human-readable identifier for the Node resource. May
+                         be undefined. Certain words are reserved.
+            returned: success
+            type: str
+        network_interface:
+            description: Which Network Interface provider to use when plumbing
+                         the network connections for this Node.
+            returned: success
+            type: str
+        owner:
+            description: A string or UUID of the tenant who owns the object.
+            returned: success
+            type: str
+        portgroups:
+            description: List of ironic portgroups on this node.
+            returned: success
+            type: list
+            elements: dict
+            contains:
+              address:
+                description: Physical hardware address of this Portgroup,
+                             typically the hardware MAC address.
+                returned: success
+                type: str
+              created_at:
+                description: The UTC date and time when the resource was
+                             created, ISO 8601 format.
+                returned: success
+                type: str
+              extra:
+                description: A set of one or more arbitrary metadata key and
+                             value pairs.
+                returned: success
+                type: dict
+              id:
+                description: The UUID for the resource.
+                returned: success
+                type: str
+              internal_info:
+                description: Internal metadata set and stored by the Portgroup.
+                             This field is read-only.
+                returned: success
+                type: dict
+              is_standalone_ports_supported:
+                description: Indicates whether ports that are members of this
+                             portgroup can be used as stand-alone ports.
+                returned: success
+                type: bool
+              mode:
+                description: Mode of the port group. For possible values, refer
+                             to https://www.kernel.org/doc/Documentation/networking/bonding.txt.
+                             If not specified in a request to create a port
+                             group, it will be set to the value of the
+                             [DEFAULT]default_portgroup_mode configuration
+                             option. When set, can not be removed from the port
+                             group.
+                returned: success
+                type: str
+              name:
+                description: Human-readable identifier for the Portgroup
+                             resource. May be undefined.
+                returned: success
+                type: str
+              node_id:
+                description: UUID of the Node this resource belongs to.
+                returned: success
+                type: str
+              ports:
+                description: List of port UUID's of ports belonging to this
+                             portgroup.
+                returned: success
+                type: list
+              properties:
+                description: Key/value properties related to the port group's
+                             configuration.
+                returned: success
+                type: dict
+              updated_at:
+                description: The UTC date and time when the resource was
+                             updated, ISO 8601 format. May be "null".
+                returned: success
+                type: str
+        ports:
+            description: List of ironic ports on this node.
+            returned: success
+            type: list
+            elements: dict
+            contains:
+              address:
+                description: Physical hardware address of this network Port,
+                             typically the hardware MAC address.
+                returned: success
+                type: str
+              created_at:
+                description: The UTC date and time when the resource was
+                             created, ISO 8601 format.
+                returned: success
+                type: str
+              extra:
+                description: A set of one or more arbitrary metadata key and
+                             value pairs.
+                returned: success
+                type: dict
+              id:
+                description: The UUID for the resource.
+                returned: success
+                type: str
+              internal_info:
+                description: Internal metadata set and stored by the Port. This
+                             field is read-only.
+                returned: success
+                type: dict
+              local_link_connection:
+                description: The Port binding profile. If specified, must
+                             contain switch_id (only a MAC address or an
+                             OpenFlow based datapath_id of the switch are
+                             accepted in this field) and port_id (identifier of
+                             the physical port on the switch to which node's
+                             port is connected to) fields. switch_info is an
+                             optional string field to be used to store any
+                             vendor-specific information.
+                returned: success
+                type: dict
+              name:
+                description: The name of the resource.
+                returned: success
+                type: str
+              node_uuid:
+                description: UUID of the Node this resource belongs to.
+                returned: success
+                type: str
+              physical_network:
+                description: The name of the physical network to which a port
+                             is connected. May be empty.
+                returned: success
+                type: str
+              portgroup_uuid:
+                description: UUID of the Portgroup this resource belongs to.
+                returned: success
+                type: str
+              pxe_enabled:
+                description: Indicates whether PXE is enabled or disabled on
+                             the Port.
+                returned: success
+                type: str
+              updated_at:
+                description: The UTC date and time when the resource was
+                             updated, ISO 8601 format. May be "null".
+                returned: success
+                type: str
+              uuid:
+                description: The UUID for the resource.
+                returned: success
+                type: str
+        power_interface:
+            description: Interface used for performing power actions on the
+                         node, e.g. "ipmitool".
+            returned: success
+            type: str
+        power_state:
+            description: The current power state of this Node. Usually, "power
+                         on" or "power off", but may be "None" if Ironic is
+                         unable to determine the power state (eg, due to
+                         hardware failure).
+            returned: success
+            type: str
+        properties:
+            description: Physical characteristics of this Node. Populated by
+                         ironic-inspector during inspection. May be edited via
+                         the REST API at any time.
+            returned: success
+            type: dict
+        protected:
+            description: Whether the node is protected from undeploying,
+                         rebuilding and deletion.
+            returned: success
+            type: bool
+        protected_reason:
+            description: The reason the node is marked as protected.
+            returned: success
+            type: str
+        provision_state:
+            description: The current provisioning state of this Node.
+            returned: success
+            type: str
+        raid_config:
+            description: Represents the current RAID configuration of the node.
+                         Introduced with the cleaning feature.
+            returned: success
+            type: dict
+        raid_interface:
+            description: Interface used for configuring RAID on this node.
+            returned: success
+            type: str
+        rescue_interface:
+            description: The interface used for node rescue, e.g. "no-rescue".
+            returned: success
+            type: str
+        reservation:
+            description: The name of an Ironic Conductor host which is holding
+                         a lock on this node, if a lock is held. Usually
+                         "null", but this field can be useful for debugging.
+            returned: success
+            type: str
+        resource_class:
+            description: A string which can be used by external schedulers to
+                         identify this Node as a unit of a specific type of
+                         resource. For more details, see
+                         https://docs.openstack.org/ironic/latest/install/configure-nova-flavors.html
+            returned: success
+            type: str
+        retired:
+            description: Whether the node is retired and can hence no longer be
+                         provided, i.e. move from manageable to available, and
+                         will end up in manageable after cleaning (rather than
+                         available).
+            returned: success
+            type: bool
+        retired_reason:
+            description: The reason the node is marked as retired.
+            returned: success
+            type: str
+        secure_boot:
+            description: Indicates whether node is currently booted with
+                         secure_boot turned on.
+            returned: success
+            type: bool
+        storage_interface:
+            description: Interface used for attaching and detaching volumes on
+                         this node, e.g. "cinder".
+            returned: success
+            type: str
+        target_power_state:
+            description: If a power state transition has been requested, this
+                         field represents the requested (ie, "target") state,
+                         either "power on" or "power off".
+            returned: success
+            type: str
+        target_provision_state:
+            description: If a provisioning action has been requested, this
+                         field represents the requested (ie, "target") state.
+                         Note that a Node may go through several states during
+                         its transition to this target state. For instance,
+                         when requesting an instance be deployed to an
+                         AVAILABLE Node, the Node may go through the following
+                         state change progression, AVAILABLE -> DEPLOYING ->
+                         DEPLOYWAIT -> DEPLOYING -> ACTIVE
+            returned: success
+            type: str
+        target_raid_config:
+            description: Represents the requested RAID configuration of the
+                         node, which will be applied when the Node next
+                         transitions through the CLEANING state. Introduced
+                         with the cleaning feature.
+            returned: success
+            type: dict
+        traits:
+            description: List of traits for this node.
+            returned: success
+            type: list
+        updated_at:
+            description: Bare Metal node updated at timestamp.
+            returned: success
+            type: str
+        uuid:
+            description: The UUID for the resource.
+            returned: success
+            type: str
+        vendor_interface:
+            description: Interface for vendor-specific functionality on this
+                         node, e.g. "no-vendor".
+            returned: success
+            type: str
+'''
+
+
+from ansible_collections.openstack.cloud.plugins.module_utils.ironic import (
+    IronicModule,
+    ironic_argument_spec,
+)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (
+    openstack_module_kwargs,
+    openstack_cloud_from_module
+)
+
+
+def cleanup_node_properties(machine, cloud):
+    # states are links, not useful
+    machine.pop('states', None)
+
+    for port in machine.ports:
+        # links are not useful
+        port.pop('links', None)
+        # redundant, location is in on machine as well
+        port.pop('location', None)
+
+    for portgroup in machine.portgroups:
+        # links are not useful
+        portgroup.pop('links', None)
+        # redundant, location is in on machine as well
+        portgroup.pop('location', None)
+        # links to ports are not useful, replace with list of port uuid's
+        portgroup['ports'] = [x.id for x in list(
+            cloud.baremetal.ports(portgroup=portgroup['id']))]
+
+
+def get_ports_and_portgroups(cloud, machine):
+    machine.ports = cloud.list_nics_for_machine(machine.uuid)
+    machine.portgroups = [dict(x) for x in
+                          list(cloud.baremetal.port_groups(node=machine.uuid,
+                                                           details=True))]
+
+
+def main():
+    argument_spec = ironic_argument_spec(
+        node=dict(required=False),
+        mac=dict(required=False),
+    )
+    module_kwargs = openstack_module_kwargs()
+    module_kwargs['supports_check_mode'] = True
+
+    module = IronicModule(argument_spec, **module_kwargs)
+
+    machine = None
+    machines = list()
+
+    sdk, cloud = openstack_cloud_from_module(module)
+    try:
+        if module.params['node']:
+            machine = cloud.get_machine(module.params['node'])
+        elif module.params['mac']:
+            machine = cloud.get_machine_by_mac(module.params['mac'])
+
+        # Fail if node not found
+        if (module.params['node'] or module.params['mac']) and not machine:
+            module.fail_json(msg='The baremetal node was not found')
+
+        if machine:
+            machines.append(machine)
+        else:
+            machines = cloud.list_machines()
+
+        for machine in machines:
+            get_ports_and_portgroups(cloud, machine)
+            cleanup_node_properties(machine, cloud)
+
+        module.exit_json(changed=False, baremetal_nodes=machines)
+    except sdk.exceptions.OpenStackCloudException as e:
+        module.fail_json(msg=str(e))
+
+
+if __name__ == "__main__":
+    main()

plugins/modules/baremetal_port.py

@@ -0,0 +1,373 @@
+#!/usr/bin/python
+# coding: utf-8 -*-
+# Copyright (c) 2021 by Red Hat, Inc.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+DOCUMENTATION = '''
+module: baremetal_port
+short_description: Create/Delete Bare Metal port Resources from OpenStack
+author: OpenStack Ansible SIG
+description:
+    - Create, Update and Remove ironic ports from OpenStack.
+options:
+    state:
+      description:
+        - Indicates desired state of the resource
+      choices: ['present', 'absent']
+      default: present
+      type: str
+    uuid:
+      description:
+        - globally unique identifier (UUID) to be given to the resource. Will
+          be auto-generated if not specified.
+      type: str
+    node:
+      description:
+        - UUID or Name of the Node this resource belongs to.
+      type: str
+    address:
+      description:
+        - Physical hardware address of this network Port, typically the
+          hardware MAC address.
+      type: str
+    portgroup:
+      description:
+        - UUID or Name of the Portgroup this resource belongs to.
+      type: str
+    local_link_connection:
+      description:
+        - The Port binding profile.
+      type: dict
+      suboptions:
+        switch_id:
+          description:
+            - A MAC address or an OpenFlow based datapath_id of the switch.
+          type: str
+        port_id:
+          description:
+            - Identifier of the physical port on the switch to which node's
+              port is connected to.
+          type: str
+        switch_info:
+          description:
+            - An optional string field to be used to store any vendor-specific
+              information.
+          type: str
+    is_pxe_enabled:
+      description:
+        - Whether PXE should be enabled or disabled on the Port.
+      type: bool
+    physical_network:
+      description:
+        - The name of the physical network to which a port is connected.
+      type: str
+    extra:
+      description:
+        - A set of one or more arbitrary metadata key and value pairs.
+      type: dict
+    ironic_url:
+      description:
+        - If noauth mode is utilized, this is required to be set to the
+          endpoint URL for the Ironic API.  Use with "auth" and "auth_type"
+          settings set to None.
+      type: str
+
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
+extends_documentation_fragment:
+- openstack.cloud.openstack
+'''
+
+EXAMPLES = '''
+# Create Bare Metal port
+- name: Create Bare Metal port
+  openstack.cloud.baremetal_port:
+    cloud: devstack
+    state: present
+    node: bm-0
+    address: fa:16:3e:aa:aa:aa
+    pxe_enabled: True
+    local_link_connection:
+      switch_id: 0a:1b:2c:3d:4e:5f
+      port_id: Ethernet3/1
+      switch_info: switch1
+    extra:
+      something: extra
+    physical_network: datacenter
+  register: result
+# Delete Bare Metal port
+- name: Delete Bare Metal port
+  openstack.cloud.baremetal_port:
+    cloud: devstack
+    state: absent
+    address: fa:16:3e:aa:aa:aa
+  register: result
+# Update Bare Metal port
+- name: Update Bare Metal port
+  openstack.cloud.baremetal_port:
+    cloud: devstack
+    state: present
+    uuid: 1a85ebca-22bf-42eb-ad9e-f640789b8098
+    pxe_enabled: False
+    local_link_connection:
+      switch_id: a0:b1:c2:d3:e4:f5
+      port_id: Ethernet4/12
+      switch_info: switch2
+'''
+
+RETURN = '''
+id:
+    description: Unique UUID of the port.
+    returned: always, but can be null
+    type: str
+result:
+    description: A short text describing the result.
+    returned: success
+    type: str
+changes:
+    description: Map showing from -> to values for properties that was changed
+                 after port update.
+    returned: success
+    type: dict
+port:
+    description: A port dictionary, subset of the dictionary keys listed below
+                 may be returned, depending on your cloud provider.
+    returned: success
+    type: complex
+    contains:
+        address:
+            description: Physical hardware address of this network Port,
+                         typically the hardware MAC address.
+            returned: success
+            type: str
+        created_at:
+            description: Bare Metal port created at timestamp.
+            returned: success
+            type: str
+        extra:
+            description: A set of one or more arbitrary metadata key and value
+                         pairs.
+            returned: success
+            type: dict
+        id:
+            description: The UUID for the Baremetal Port resource.
+            returned: success
+            type: str
+        internal_info:
+            description: Internal metadata set and stored by the Port. This
+                         field is read-only.
+            returned: success
+            type: dict
+        is_pxe_enabled:
+            description: Whether PXE is enabled or disabled on the Port.
+            returned: success
+            type: bool
+        local_link_connection:
+            description: The Port binding profile. If specified, must contain
+                         switch_id (only a MAC address or an OpenFlow based
+                         datapath_id of the switch are accepted in this field
+                         and port_id (identifier of the physical port on the
+                         switch to which node's port is connected to) fields.
+                         switch_info is an optional string field to be used to
+                         store any vendor-specific information.
+            returned: success
+            type: dict
+        location:
+            description: Cloud location of this resource (cloud, project,
+                         region, zone)
+            returned: success
+            type: dict
+        name:
+            description: Bare Metal port name.
+            returned: success
+            type: str
+        node_id:
+            description: UUID of the Bare Metal Node this resource belongs to.
+            returned: success
+            type: str
+        physical_network:
+            description: The name of the physical network to which a port is
+                         connected.
+            returned: success
+            type: str
+        port_group_id:
+            description: UUID  of the Portgroup this resource belongs to.
+            returned: success
+            type: str
+        updated_at:
+            description: Bare Metal port updated at timestamp.
+            returned: success
+            type: str
+'''
+
+from ansible_collections.openstack.cloud.plugins.module_utils.ironic import (
+    IronicModule,
+    ironic_argument_spec,
+)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (
+    openstack_module_kwargs,
+    openstack_cloud_from_module
+)
+
+_PROP_TO_ATTR_MAP = {
+    'pxe_enabled': 'is_pxe_enabled',
+    'address': 'address',
+    'extra': 'extra',
+    'local_link_connection': 'local_link_connection',
+    'physical_network': 'physical_network',
+    'node_uuid': 'node_id',
+    'portgroup_uuid': 'port_group_id',
+    'uuid': 'id',
+}
+
+
+def find_port(module, cloud):
+    port = None
+    if module.params['uuid']:
+        port = cloud.baremetal.find_port(module.params['uuid'])
+    elif module.params['address']:
+        ports = list(cloud.baremetal.ports(address=module.params['address'],
+                                           details=True))
+        if ports and len(ports) == 1:
+            port = ports[0]
+        elif len(ports) > 1:
+            module.fail_json(
+                msg="Multiple ports with address {address} found. A uuid must "
+                    "be defined in order to identify the correct port"
+                    .format(address=module.params['address']))
+
+    return port
+
+
+def add_port(module, cloud):
+    port = find_port(module, cloud)
+    if port:
+        update_port(module, cloud, port=port)
+
+    if not module.params['node'] or not module.params['address']:
+        module.fail_json(
+            msg="A Bare Metal node (name or uuid) and an address is required "
+                "to create a port")
+
+    machine = cloud.get_machine(module.params['node'])
+    if not machine:
+        module.fail_json(
+            msg="Bare Metal node {node} could not be found".format(
+                node=module.params['node']))
+
+    module.params['node_uuid'] = machine.id
+    props = {k: module.params[k] for k in _PROP_TO_ATTR_MAP.keys()
+             if k in module.params}
+    port = cloud.baremetal.create_port(**props)
+    port_dict = port.to_dict()
+    port_dict.pop('links', None)
+    module.exit_json(
+        changed=True,
+        result="Port successfully created",
+        changes=None,
+        port=port_dict,
+        id=port_dict['id'])
+
+
+def update_port(module, cloud, port=None):
+    if not port:
+        port = find_port(module, cloud)
+
+    if module.params['node']:
+        machine = cloud.get_machine(module.params['node'])
+        if machine:
+            module.params['node_uuid'] = machine.id
+
+    old_props = {k: port[v] for k, v in _PROP_TO_ATTR_MAP.items()}
+    new_props = {k: module.params[k] for k in _PROP_TO_ATTR_MAP.keys()
+                 if k in module.params and module.params[k] is not None}
+    prop_diff = {k: new_props[k] for k in _PROP_TO_ATTR_MAP.keys()
+                 if k in new_props and old_props[k] != new_props[k]}
+
+    if not prop_diff:
+        port_dict = port.to_dict()
+        port_dict.pop('links', None)
+        module.exit_json(
+            changed=False,
+            result="No port update required",
+            changes=None,
+            port=port_dict,
+            id=port_dict['id'])
+
+    port = cloud.baremetal.update_port(port.id, **prop_diff)
+    port_dict = port.to_dict()
+    port_dict.pop('links', None)
+    module.exit_json(
+        changed=True,
+        result="Port successfully updated",
+        changes={k: {'to': new_props[k], 'from': old_props[k]}
+                 for k in prop_diff},
+        port=port_dict,
+        id=port_dict['id'])
+
+
+def remove_port(module, cloud):
+    if not module.params['uuid'] and not module.params['address']:
+        module.fail_json(
+            msg="A uuid or an address value must be defined in order to "
+                "remove a port.")
+    if module.params['uuid']:
+        port = cloud.baremetal.delete_port(module.params['uuid'])
+        if not port:
+            module.exit_json(
+                changed=False,
+                result="Port not found",
+                changes=None,
+                id=module.params['uuid'])
+    else:
+        port = find_port(module, cloud)
+        if not port:
+            module.exit_json(
+                changed=False,
+                result="Port not found",
+                changes=None,
+                id=None)
+        port = cloud.baremetal.delete_port(port.id)
+
+    module.exit_json(
+        changed=True,
+        result="Port successfully removed",
+        changes=None,
+        id=port.id)
+
+
+def main():
+    argument_spec = ironic_argument_spec(
+        uuid=dict(required=False),
+        node=dict(required=False),
+        address=dict(required=False),
+        portgroup=dict(required=False),
+        local_link_connection=dict(required=False, type='dict'),
+        is_pxe_enabled=dict(required=False, type='bool'),
+        physical_network=dict(required=False),
+        extra=dict(required=False, type='dict'),
+        state=dict(required=False,
+                   default='present',
+                   choices=['present', 'absent'])
+    )
+
+    module_kwargs = openstack_module_kwargs()
+    module = IronicModule(argument_spec, **module_kwargs)
+
+    module.params['pxe_enabled'] = module.params.pop('is_pxe_enabled', None)
+
+    sdk, cloud = openstack_cloud_from_module(module)
+    try:
+        if module.params['state'] == 'present':
+            add_port(module, cloud)
+
+        if module.params['state'] == 'absent':
+            remove_port(module, cloud)
+
+    except sdk.exceptions.OpenStackCloudException as e:
+        module.fail_json(msg=str(e))
+
+
+if __name__ == "__main__":
+    main()

plugins/modules/baremetal_port_info.py

@@ -0,0 +1,208 @@
+#!/usr/bin/python
+# coding: utf-8 -*-
+# Copyright (c) 2021 by Red Hat, Inc.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+DOCUMENTATION = '''
+module: baremetal_port_info
+short_description: Retrieve information about Bare Metal ports from OpenStack
+author: OpenStack Ansible SIG
+description:
+    - Retrieve information about Bare Metal ports from OpenStack.
+options:
+    uuid:
+      description:
+        - Name or globally unique identifier (UUID) to identify the port.
+      type: str
+    address:
+      description:
+        - Physical hardware address of this network Port, typically the
+          hardware MAC address.
+      type: str
+    node:
+      description:
+        - Name or globally unique identifier (UUID) to identify a Baremetal
+          Node.
+      type: str
+    ironic_url:
+      description:
+        - If noauth mode is utilized, this is required to be set to the
+          endpoint URL for the Ironic API.  Use with "auth" and "auth_type"
+          settings set to None.
+      type: str
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
+extends_documentation_fragment:
+- openstack.cloud.openstack
+'''
+
+EXAMPLES = '''
+# Gather information about all baremetal ports
+- openstack.cloud.baremetal_port_info:
+    cloud: devstack
+  register: result
+# Gather information about a baremetal port by address
+- openstack.cloud.baremetal_port_info:
+    cloud: devstack
+    address: fa:16:3e:aa:aa:aa
+  register: result
+# Gather information about a baremetal port by address
+- openstack.cloud.baremetal_port_info:
+    cloud: devstack
+    uuid: a2b6bd99-77b9-43f0-9ddc-826568e68dec
+  register: result
+# Gather information about a baremetal ports associated with a baremetal node
+- openstack.cloud.baremetal_port_info:
+    cloud: devstack
+    node: bm-0
+  register: result
+'''
+
+RETURN = '''
+baremetal_ports:
+    description: Bare Metal port list. A subset of the dictionary keys
+                 listed below may be returned, depending on your cloud
+                 provider.
+    returned: always, but can be null
+    type: list
+    elements: dict
+    contains:
+        address:
+            description: Physical hardware address of this network Port,
+                         typically the hardware MAC address.
+            returned: success
+            type: str
+        created_at:
+            description: Bare Metal port created at timestamp.
+            returned: success
+            type: str
+        extra:
+            description: A set of one or more arbitrary metadata key and
+                         value pairs.
+            returned: success
+            type: dict
+        id:
+            description: The UUID for the Baremetal Port resource.
+            returned: success
+            type: str
+        internal_info:
+            description: Internal metadata set and stored by the Port. This
+                         field is read-only.
+            returned: success
+            type: dict
+        is_pxe_enabled:
+            description: Whether PXE is enabled or disabled on the Port.
+            returned: success
+            type: bool
+        local_link_connection:
+            description: The Port binding profile.
+            returned: success
+            type: dict
+            contains:
+              switch_id:
+                description: A MAC address or an OpenFlow based datapath_id of
+                             the switch.
+                type: str
+              port_id:
+                description: Identifier of the physical port on the switch to
+                             which node's port is connected to.
+                type: str
+              switch_info:
+                description: An optional string field to be used to store any
+                             vendor-specific information.
+                type: str
+        location:
+            description: Cloud location of this resource (cloud, project,
+                         region, zone)
+            returned: success
+            type: dict
+        name:
+            description: Bare Metal port name.
+            returned: success
+            type: str
+        node_id:
+            description: UUID of the Bare Metal Node this resource belongs to.
+            returned: success
+            type: str
+        physical_network:
+            description: The name of the physical network to which a port is
+                         connected.
+            returned: success
+            type: str
+        port_group_id:
+            description: UUID  of the Portgroup this resource belongs to.
+            returned: success
+            type: str
+        updated_at:
+            description: Bare Metal port updated at timestamp.
+            returned: success
+            type: str
+'''
+
+
+from ansible_collections.openstack.cloud.plugins.module_utils.ironic import (
+    IronicModule,
+    ironic_argument_spec,
+)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (
+    openstack_module_kwargs,
+    openstack_cloud_from_module
+)
+
+
+def main():
+    argument_spec = ironic_argument_spec(
+        uuid=dict(required=False),
+        address=dict(required=False),
+        node=dict(required=False),
+    )
+    module_kwargs = openstack_module_kwargs()
+    module_kwargs['supports_check_mode'] = True
+    module = IronicModule(argument_spec, **module_kwargs)
+
+    ports = list()
+    sdk, cloud = openstack_cloud_from_module(module)
+    try:
+        if module.params['uuid']:
+            port = cloud.baremetal.find_port(module.params['uuid'])
+            if not port:
+                module.fail_json(
+                    msg='Baremetal port with uuid {uuid} was not found'
+                        .format(uuid=module.params['uuid']))
+            ports.append(port)
+
+        elif module.params['address']:
+            ports = list(
+                cloud.baremetal.ports(address=module.params['address'],
+                                      details=True))
+            if not ports:
+                module.fail_json(
+                    msg='Baremetal port with address {address} was not found'
+                        .format(address=module.params['address']))
+
+        elif module.params['node']:
+            machine = cloud.get_machine(module.params['node'])
+            if not machine:
+                module.fail_json(
+                    msg='Baremetal node {node} was not found'
+                        .format(node=module.params['node']))
+            ports = list(
+                cloud.baremetal.ports(node_uuid=machine.uuid, details=True))
+
+        else:
+            ports = list(cloud.baremetal.ports(details=True))
+
+        # Convert ports to dictionaries and cleanup properties
+        ports = [port.to_dict() for port in ports]
+        for port in ports:
+            # links are not useful
+            port.pop('links', None)
+
+        module.exit_json(changed=False, baremetal_ports=ports)
+    except sdk.exceptions.OpenStackCloudException as e:
+        module.fail_json(msg=str(e))
+
+
+if __name__ == "__main__":
+    main()

plugins/modules/catalog_service.py

@@ -6,7 +6,7 @@ DOCUMENTATION = '''
 ---
 module: catalog_service
 short_description: Manage OpenStack Identity services
-author: "Sam Yaple (@SamYaple)"
+author: OpenStack Ansible SIG
 description:
     - Create, update, or delete OpenStack Identity service. If a service
       with the supplied name already exists, it will be updated with the
@@ -94,36 +94,11 @@ id:
     sample: "3292f020780b4d5baf27ff7e1d224c44"
 '''
 
-from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
 
 
-def _needs_update(module, service):
+class IdentityCatalogServiceModule(OpenStackModule):
-    if service.enabled != module.params['enabled']:
+    argument_spec = dict(
-        return True
-    if service.description is not None and \
-       service.description != module.params['description']:
-        return True
-    return False
-
-
-def _system_state_change(module, service):
-    state = module.params['state']
-    if state == 'absent' and service:
-        return True
-
-    if state == 'present':
-        if service is None:
-            return True
-        return _needs_update(module, service)
-
-    return False
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
         description=dict(default=None),
         enabled=dict(default=True, type='bool'),
         name=dict(required=True),
@@ -131,58 +106,79 @@ def main():
         state=dict(default='present', choices=['absent', 'present']),
     )
 
-    module_kwargs = openstack_module_kwargs()
+    module_kwargs = dict(
-    module = AnsibleModule(argument_spec,
+        supports_check_mode=True
-                           supports_check_mode=True,
+    )
-                           **module_kwargs)
 
-    description = module.params['description']
+    def _needs_update(self, service):
-    enabled = module.params['enabled']
+        if service.enabled != self.params['enabled']:
-    name = module.params['name']
+            return True
-    state = module.params['state']
+        if service.description is not None and \
-    service_type = module.params['service_type']
+           service.description != self.params['description']:
+            return True
+        return False
 
-    sdk, cloud = openstack_cloud_from_module(module)
+    def _system_state_change(self, service):
-    try:
+        state = self.params['state']
-        services = cloud.search_services(name_or_id=name,
+        if state == 'absent' and service:
-                                         filters=dict(type=service_type))
+            return True
+
+        if state == 'present':
+            if service is None:
+                return True
+            return self._needs_update(service)
+
+        return False
+
+    def run(self):
+        description = self.params['description']
+        enabled = self.params['enabled']
+        name = self.params['name']
+        state = self.params['state']
+        service_type = self.params['service_type']
+
+        services = self.conn.search_services(
+            name_or_id=name, filters=dict(type=service_type))
 
         if len(services) > 1:
-            module.fail_json(msg='Service name %s and type %s are not unique' %
+            self.fail_json(
-                             (name, service_type))
+                msg='Service name %s and type %s are not unique'
+                % (name, service_type))
         elif len(services) == 1:
             service = services[0]
         else:
             service = None
 
-        if module.check_mode:
+        if self.ansible.check_mode:
-            module.exit_json(changed=_system_state_change(module, service))
+            self.exit_json(changed=self._system_state_change(service))
 
         if state == 'present':
             if service is None:
-                service = cloud.create_service(name=name, description=description,
+                service = self.conn.create_service(
-                                               type=service_type, enabled=True)
+                    name=name, description=description, type=service_type, enabled=True)
                 changed = True
             else:
-                if _needs_update(module, service):
+                if self._needs_update(service):
-                    service = cloud.update_service(
+                    service = self.conn.update_service(
                         service.id, name=name, type=service_type, enabled=enabled,
                         description=description)
                     changed = True
                 else:
                     changed = False
-            module.exit_json(changed=changed, service=service, id=service.id)
+            self.exit_json(changed=changed, service=service, id=service.id)
 
         elif state == 'absent':
             if service is None:
                 changed = False
             else:
-                cloud.delete_service(service.id)
+                self.conn.delete_service(service.id)
                 changed = True
-            module.exit_json(changed=changed)
+            self.exit_json(changed=changed)
 
-    except sdk.exceptions.OpenStackCloudException as e:
+
-        module.fail_json(msg=str(e))
+def main():
+    module = IdentityCatalogServiceModule()
+    module()
 
 
 if __name__ == '__main__':

plugins/modules/coe_cluster.py

@@ -7,7 +7,7 @@ DOCUMENTATION = '''
 ---
 module: coe_cluster
 short_description: Add/Remove COE cluster from OpenStack Cloud
-author: "Feilong Wang (@flwang)"
+author: OpenStack Ansible SIG
 description:
    - Add or Remove COE cluster from the OpenStack Container Infra service.
 options:
@@ -206,31 +206,16 @@ EXAMPLES = '''
     node_count: 5
 '''
 
-from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
 
 
-def _parse_labels(labels):
+class CoeClusterModule(OpenStackModule):
-    if isinstance(labels, str):
+    argument_spec = dict(
-        labels_dict = {}
-        for kv_str in labels.split(","):
-            k, v = kv_str.split("=")
-            labels_dict[k] = v
-        return labels_dict
-    if not labels:
-        return {}
-    return labels
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
         cluster_template_id=dict(required=True),
         discovery_url=dict(default=None),
         docker_volume_size=dict(type='int'),
         flavor_id=dict(default=None),
-        keypair=dict(default=None),
+        keypair=dict(default=None, no_log=False),
         labels=dict(default=None, type='raw'),
         master_count=dict(type='int', default=1),
         master_flavor_id=dict(default=None),
@@ -239,35 +224,46 @@ def main():
         state=dict(default='present', choices=['absent', 'present']),
         timeout=dict(type='int', default=60),
     )
-    module_kwargs = openstack_module_kwargs()
+    module_kwargs = dict()
-    module = AnsibleModule(argument_spec, **module_kwargs)
 
-    params = module.params.copy()
+    def _parse_labels(self, labels):
+        if isinstance(labels, str):
+            labels_dict = {}
+            for kv_str in labels.split(","):
+                k, v = kv_str.split("=")
+                labels_dict[k] = v
+            return labels_dict
+        if not labels:
+            return {}
+        return labels
 
-    state = module.params['state']
+    def run(self):
-    name = module.params['name']
+        params = self.params.copy()
-    cluster_template_id = module.params['cluster_template_id']
 
-    kwargs = dict(
+        state = self.params['state']
-        discovery_url=module.params['discovery_url'],
+        name = self.params['name']
-        docker_volume_size=module.params['docker_volume_size'],
+        cluster_template_id = self.params['cluster_template_id']
-        flavor_id=module.params['flavor_id'],
+
-        keypair=module.params['keypair'],
+        kwargs = dict(
-        labels=_parse_labels(params['labels']),
+            discovery_url=self.params['discovery_url'],
-        master_count=module.params['master_count'],
+            docker_volume_size=self.params['docker_volume_size'],
-        master_flavor_id=module.params['master_flavor_id'],
+            flavor_id=self.params['flavor_id'],
-        node_count=module.params['node_count'],
+            keypair=self.params['keypair'],
-        create_timeout=module.params['timeout'],
+            labels=self._parse_labels(params['labels']),
-    )
+            master_count=self.params['master_count'],
+            master_flavor_id=self.params['master_flavor_id'],
+            node_count=self.params['node_count'],
+            create_timeout=self.params['timeout'],
+        )
 
-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
         changed = False
-        cluster = cloud.get_coe_cluster(name_or_id=name, filters={'cluster_template_id': cluster_template_id})
+        cluster = self.conn.get_coe_cluster(
+            name_or_id=name, filters={'cluster_template_id': cluster_template_id})
 
         if state == 'present':
             if not cluster:
-                cluster = cloud.create_coe_cluster(name, cluster_template_id=cluster_template_id, **kwargs)
+                cluster = self.conn.create_coe_cluster(
+                    name, cluster_template_id=cluster_template_id, **kwargs)
                 changed = True
             else:
                 changed = False
@@ -278,15 +274,18 @@ def main():
             # therefore try `id` first then `uuid`.
             cluster_id = cluster.get('id', cluster.get('uuid'))
             cluster['id'] = cluster['uuid'] = cluster_id
-            module.exit_json(changed=changed, cluster=cluster, id=cluster_id)
+            self.exit_json(changed=changed, cluster=cluster, id=cluster_id)
         elif state == 'absent':
             if not cluster:
-                module.exit_json(changed=False)
+                self.exit_json(changed=False)
             else:
-                cloud.delete_coe_cluster(name)
+                self.conn.delete_coe_cluster(name)
-                module.exit_json(changed=True)
+                self.exit_json(changed=True)
-    except sdk.exceptions.OpenStackCloudException as e:
+
-        module.fail_json(msg=str(e), extra_data=e.extra_data)
+
+def main():
+    module = CoeClusterModule()
+    module()
 
 
 if __name__ == "__main__":

plugins/modules/coe_cluster_template.py

@@ -7,7 +7,7 @@ DOCUMENTATION = '''
 ---
 module: coe_cluster_template
 short_description: Add/Remove COE cluster template from OpenStack Cloud
-author: "Feilong Wang (@flwang)"
+author: OpenStack Ansible SIG
 description:
    - Add or Remove COE cluster template from the OpenStack Container Infra
      service.
@@ -281,26 +281,11 @@ EXAMPLES = '''
     public: no
 '''
 
-from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
 
 
-def _parse_labels(labels):
+class CoeClusterTemplateModule(OpenStackModule):
-    if isinstance(labels, str):
+    argument_spec = dict(
-        labels_dict = {}
-        for kv_str in labels.split(","):
-            k, v = kv_str.split("=")
-            labels_dict[k] = v
-        return labels_dict
-    if not labels:
-        return {}
-    return labels
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
         coe=dict(required=True, choices=['kubernetes', 'swarm', 'mesos']),
         dns_nameserver=dict(default='8.8.8.8'),
         docker_storage_driver=dict(choices=['devicemapper', 'overlay', 'overlay2']),
@@ -327,61 +312,76 @@ def main():
         tls_disabled=dict(type='bool', default=False),
         volume_driver=dict(choices=['cinder', 'rexray']),
     )
-    module_kwargs = openstack_module_kwargs()
+    module_kwargs = dict()
-    module = AnsibleModule(argument_spec, **module_kwargs)
 
-    params = module.params.copy()
+    def _parse_labels(self, labels):
+        if isinstance(labels, str):
+            labels_dict = {}
+            for kv_str in labels.split(","):
+                k, v = kv_str.split("=")
+                labels_dict[k] = v
+            return labels_dict
+        if not labels:
+            return {}
+        return labels
 
-    state = module.params['state']
+    def run(self):
-    name = module.params['name']
+        params = self.params.copy()
-    coe = module.params['coe']
-    image_id = module.params['image_id']
 
-    kwargs = dict(
+        state = self.params['state']
-        dns_nameserver=module.params['dns_nameserver'],
+        name = self.params['name']
-        docker_storage_driver=module.params['docker_storage_driver'],
+        coe = self.params['coe']
-        docker_volume_size=module.params['docker_volume_size'],
+        image_id = self.params['image_id']
-        external_network_id=module.params['external_network_id'],
+
-        fixed_network=module.params['fixed_network'],
+        kwargs = dict(
-        fixed_subnet=module.params['fixed_subnet'],
+            dns_nameserver=self.params['dns_nameserver'],
-        flavor_id=module.params['flavor_id'],
+            docker_storage_driver=self.params['docker_storage_driver'],
-        floating_ip_enabled=module.params['floating_ip_enabled'],
+            docker_volume_size=self.params['docker_volume_size'],
-        keypair_id=module.params['keypair_id'],
+            external_network_id=self.params['external_network_id'],
-        labels=_parse_labels(params['labels']),
+            fixed_network=self.params['fixed_network'],
-        http_proxy=module.params['http_proxy'],
+            fixed_subnet=self.params['fixed_subnet'],
-        https_proxy=module.params['https_proxy'],
+            flavor_id=self.params['flavor_id'],
-        master_lb_enabled=module.params['master_lb_enabled'],
+            floating_ip_enabled=self.params['floating_ip_enabled'],
-        master_flavor_id=module.params['master_flavor_id'],
+            keypair_id=self.params['keypair_id'],
-        network_driver=module.params['network_driver'],
+            labels=self._parse_labels(params['labels']),
-        no_proxy=module.params['no_proxy'],
+            http_proxy=self.params['http_proxy'],
-        public=module.params['public'],
+            https_proxy=self.params['https_proxy'],
-        registry_enabled=module.params['registry_enabled'],
+            master_lb_enabled=self.params['master_lb_enabled'],
-        server_type=module.params['server_type'],
+            master_flavor_id=self.params['master_flavor_id'],
-        tls_disabled=module.params['tls_disabled'],
+            network_driver=self.params['network_driver'],
-        volume_driver=module.params['volume_driver'],
+            no_proxy=self.params['no_proxy'],
-    )
+            public=self.params['public'],
+            registry_enabled=self.params['registry_enabled'],
+            server_type=self.params['server_type'],
+            tls_disabled=self.params['tls_disabled'],
+            volume_driver=self.params['volume_driver'],
+        )
 
-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
         changed = False
-        template = cloud.get_coe_cluster_template(name_or_id=name, filters={'coe': coe, 'image_id': image_id})
+        template = self.conn.get_coe_cluster_template(
+            name_or_id=name, filters={'coe': coe, 'image_id': image_id})
 
         if state == 'present':
             if not template:
-                template = cloud.create_coe_cluster_template(name, coe=coe, image_id=image_id, **kwargs)
+                template = self.conn.create_coe_cluster_template(
+                    name, coe=coe, image_id=image_id, **kwargs)
                 changed = True
             else:
                 changed = False
 
-            module.exit_json(changed=changed, cluster_template=template, id=template['uuid'])
+            self.exit_json(
+                changed=changed, cluster_template=template, id=template['uuid'])
         elif state == 'absent':
             if not template:
-                module.exit_json(changed=False)
+                self.exit_json(changed=False)
             else:
-                cloud.delete_coe_cluster_template(name)
+                self.conn.delete_coe_cluster_template(name)
-                module.exit_json(changed=True)
+                self.exit_json(changed=True)
-    except sdk.exceptions.OpenStackCloudException as e:
+
-        module.fail_json(msg=str(e), extra_data=e.extra_data)
+
+def main():
+    module = CoeClusterTemplateModule()
+    module()
 
 
 if __name__ == "__main__":

plugins/modules/compute_flavor.py

@@ -7,7 +7,7 @@ DOCUMENTATION = '''
 ---
 module: compute_flavor
 short_description: Manage OpenStack compute flavors
-author: "David Shrewsbury (@Shrews)"
+author: OpenStack Ansible SIG
 description:
    - Add or remove flavors from OpenStack.
 options:
@@ -160,23 +160,11 @@ flavor:
                 "aggregate_instance_extra_specs:pinned": false
 '''
 
-from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
 
 
-def _system_state_change(module, flavor):
+class ComputeFlavorModule(OpenStackModule):
-    state = module.params['state']
+    argument_spec = dict(
-    if state == 'present' and not flavor:
-        return True
-    if state == 'absent' and flavor:
-        return True
-    return False
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
         state=dict(required=False, default='present',
                    choices=['absent', 'present']),
         name=dict(required=True),
@@ -194,25 +182,30 @@ def main():
         extra_specs=dict(required=False, default=None, type='dict'),
     )
 
-    module_kwargs = openstack_module_kwargs()
+    module_kwargs = dict(
-    module = AnsibleModule(
-        argument_spec,
-        supports_check_mode=True,
         required_if=[
             ('state', 'present', ['ram', 'vcpus', 'disk'])
         ],
-        **module_kwargs)
+        supports_check_mode=True
+    )
 
-    state = module.params['state']
+    def _system_state_change(self, flavor):
-    name = module.params['name']
+        state = self.params['state']
-    extra_specs = module.params['extra_specs'] or {}
+        if state == 'present' and not flavor:
+            return True
+        if state == 'absent' and flavor:
+            return True
+        return False
 
-    sdk, cloud = openstack_cloud_from_module(module)
+    def run(self):
-    try:
+        state = self.params['state']
-        flavor = cloud.get_flavor(name)
+        name = self.params['name']
+        extra_specs = self.params['extra_specs'] or {}
 
-        if module.check_mode:
+        flavor = self.conn.get_flavor(name)
-            module.exit_json(changed=_system_state_change(module, flavor))
+
+        if self.ansible.check_mode:
+            self.exit_json(changed=self._system_state_change(flavor))
 
         if state == 'present':
             old_extra_specs = {}
@@ -220,26 +213,32 @@ def main():
 
             if flavor:
                 old_extra_specs = flavor['extra_specs']
-                for param_key in ['ram', 'vcpus', 'disk', 'ephemeral', 'swap', 'rxtx_factor', 'is_public']:
+                if flavor['swap'] == "":
-                    if module.params[param_key] != flavor[param_key]:
+                    flavor['swap'] = 0
+                for param_key in ['ram', 'vcpus', 'disk', 'ephemeral',
+                                  'swap', 'rxtx_factor', 'is_public']:
+                    if self.params[param_key] != flavor[param_key]:
                         require_update = True
                         break
-
+            flavorid = self.params['flavorid']
             if flavor and require_update:
-                cloud.delete_flavor(name)
+                self.conn.delete_flavor(name)
+                old_extra_specs = {}
+                if flavorid == 'auto':
+                    flavorid = flavor['id']
                 flavor = None
 
             if not flavor:
-                flavor = cloud.create_flavor(
+                flavor = self.conn.create_flavor(
                     name=name,
-                    ram=module.params['ram'],
+                    ram=self.params['ram'],
-                    vcpus=module.params['vcpus'],
+                    vcpus=self.params['vcpus'],
-                    disk=module.params['disk'],
+                    disk=self.params['disk'],
-                    flavorid=module.params['flavorid'],
+                    flavorid=flavorid,
-                    ephemeral=module.params['ephemeral'],
+                    ephemeral=self.params['ephemeral'],
-                    swap=module.params['swap'],
+                    swap=self.params['swap'],
-                    rxtx_factor=module.params['rxtx_factor'],
+                    rxtx_factor=self.params['rxtx_factor'],
-                    is_public=module.params['is_public']
+                    is_public=self.params['is_public']
                 )
                 changed = True
             else:
@@ -249,25 +248,26 @@ def main():
             unset_keys = set(old_extra_specs.keys()) - set(extra_specs.keys())
 
             if unset_keys and not require_update:
-                cloud.unset_flavor_specs(flavor['id'], unset_keys)
+                self.conn.unset_flavor_specs(flavor['id'], unset_keys)
 
             if old_extra_specs != new_extra_specs:
-                cloud.set_flavor_specs(flavor['id'], extra_specs)
+                self.conn.set_flavor_specs(flavor['id'], extra_specs)
 
             changed = (changed or old_extra_specs != new_extra_specs)
 
-            module.exit_json(changed=changed,
+            self.exit_json(
-                             flavor=flavor,
+                changed=changed, flavor=flavor, id=flavor['id'])
-                             id=flavor['id'])
 
         elif state == 'absent':
             if flavor:
-                cloud.delete_flavor(name)
+                self.conn.delete_flavor(name)
-                module.exit_json(changed=True)
+                self.exit_json(changed=True)
-            module.exit_json(changed=False)
+            self.exit_json(changed=False)
 
-    except sdk.exceptions.OpenStackCloudException as e:
+
-        module.fail_json(msg=str(e))
+def main():
+    module = ComputeFlavorModule()
+    module()
 
 
 if __name__ == '__main__':

plugins/modules/compute_flavor_info.py

@@ -7,7 +7,7 @@ DOCUMENTATION = '''
 ---
 module: compute_flavor_info
 short_description: Retrieve information about one or more flavors
-author: "David Shrewsbury (@Shrews)"
+author: OpenStack Ansible SIG
 description:
     - Retrieve information about available OpenStack instance flavors. By default,
       information about ALL flavors are retrieved. Filters can be applied to get
@@ -158,70 +158,60 @@ openstack_flavors:
             sample: true
 '''
 
-
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
 
 
-def main():
+class ComputeFlavorInfoModule(OpenStackModule):
-    argument_spec = openstack_full_argument_spec(
+    argument_spec = dict(
         name=dict(required=False, default=None),
         ram=dict(required=False, default=None),
         vcpus=dict(required=False, default=None),
         limit=dict(required=False, default=None, type='int'),
         ephemeral=dict(required=False, default=None),
     )
-    module_kwargs = openstack_module_kwargs(
+    module_kwargs = dict(
         mutually_exclusive=[
             ['name', 'ram'],
             ['name', 'vcpus'],
             ['name', 'ephemeral']
-        ]
+        ],
+        supports_check_mode=True
     )
-    module = AnsibleModule(argument_spec, **module_kwargs)
-    is_old_facts = module._name == 'openstack.cloud.compute_flavor_facts'
-    if is_old_facts:
-        module.deprecate("The 'openstack.cloud.compute_flavor_facts' module has been renamed to 'openstack.cloud.compute_flavor_info', "
-                         "and the renamed one no longer returns ansible_facts", version='2.13')
 
-    name = module.params['name']
+    deprecated_names = ('openstack.cloud.compute_flavor_facts')
-    vcpus = module.params['vcpus']
-    ram = module.params['ram']
-    ephemeral = module.params['ephemeral']
-    limit = module.params['limit']
 
-    filters = {}
+    def run(self):
-    if vcpus:
+        name = self.params['name']
-        filters['vcpus'] = vcpus
+        vcpus = self.params['vcpus']
-    if ram:
+        ram = self.params['ram']
-        filters['ram'] = ram
+        ephemeral = self.params['ephemeral']
-    if ephemeral:
+        limit = self.params['limit']
-        filters['ephemeral'] = ephemeral
+
+        filters = {}
+        if vcpus:
+            filters['vcpus'] = vcpus
+        if ram:
+            filters['ram'] = ram
+        if ephemeral:
+            filters['ephemeral'] = ephemeral
 
-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
         if name:
-            flavors = cloud.search_flavors(filters={'name': name})
+            flavors = self.conn.search_flavors(filters={'name': name})
 
         else:
-            flavors = cloud.list_flavors()
+            flavors = self.conn.list_flavors()
             if filters:
-                flavors = cloud.range_search(flavors, filters)
+                flavors = self.conn.range_search(flavors, filters)
 
         if limit is not None:
             flavors = flavors[:limit]
 
-        if is_old_facts:
+        self.exit_json(changed=False, openstack_flavors=flavors)
-            module.exit_json(changed=False,
-                             ansible_facts=dict(openstack_flavors=flavors))
-        else:
-            module.exit_json(changed=False,
-                             openstack_flavors=flavors)
 
-    except sdk.exceptions.OpenStackCloudException as e:
+
-        module.fail_json(msg=str(e))
+def main():
+    module = ComputeFlavorInfoModule()
+    module()
 
 
 if __name__ == '__main__':

plugins/modules/compute_service_info.py

@@ -0,0 +1,111 @@
+#!/usr/bin/python
+# Copyright (c) 2016 Hewlett-Packard Enterprise Corporation
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+DOCUMENTATION = '''
+---
+module: compute_service_info
+short_description: Retrieve information about one or more OpenStack compute services
+author: OpenStack Ansible SIG
+description:
+    - Retrieve information about nova compute services
+options:
+   binary:
+     description:
+        - Filter by service binary type
+     type: str
+   host:
+     description:
+        - Filter by service host
+     type: str
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
+
+extends_documentation_fragment:
+- openstack.cloud.openstack
+'''
+
+EXAMPLES = '''
+# Gather information about compute services
+- openstack.cloud.compute_service_info:
+    cloud: awesomecloud
+    binary: "nova-compute"
+    host: "localhost"
+  register: result
+- openstack.cloud.compute_service_info:
+    cloud: awesomecloud
+  register: result
+- debug:
+    msg: "{{ result.openstack_compute_services }}"
+'''
+
+
+RETURN = '''
+openstack_compute_services:
+    description: has all the OpenStack information about compute services
+    returned: always, but can be null
+    type: complex
+    contains:
+        id:
+            description: Unique UUID.
+            returned: success
+            type: str
+        binary:
+            description: The binary name of the service.
+            returned: success
+            type: str
+        host:
+            description: The name of the host.
+            returned: success
+            type: str
+        zone:
+            description: The availability zone name.
+            returned: success
+            type: str
+        status:
+            description: The status of the service. One of enabled or disabled.
+            returned: success
+            type: str
+        state:
+            description: The state of the service. One of up or down.
+            returned: success
+            type: str
+        update:
+            description: The date and time when the resource was updated
+            returned: success
+            type: str
+'''
+
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
+
+
+class ComputeServiceInfoModule(OpenStackModule):
+    argument_spec = dict(
+        binary=dict(required=False, default=None),
+        host=dict(required=False, default=None),
+    )
+    module_kwargs = dict(
+        supports_check_mode=True
+    )
+
+    def run(self):
+        binary = self.params['binary']
+        host = self.params['host']
+        filters = {}
+        if binary:
+            filters['binary'] = binary
+        if host:
+            filters['host'] = host
+        services = self.conn.compute.services(**filters)
+        services = list(services)
+        self.exit_json(changed=False, openstack_compute_services=services)
+
+
+def main():
+    module = ComputeServiceInfoModule()
+    module()
+
+
+if __name__ == '__main__':
+    main()

plugins/modules/config.py

@@ -23,7 +23,7 @@ options:
 requirements:
     - "python >= 3.6"
     - "openstacksdk"
-author: "Monty Taylor (@emonty)"
+author: OpenStack Ansible SIG
 '''
 
 EXAMPLES = '''

plugins/modules/container.py

@@ -0,0 +1 @@
+object_container.py

plugins/modules/dns_zone.py

@@ -6,7 +6,7 @@ DOCUMENTATION = '''
 ---
 module: dns_zone
 short_description: Manage OpenStack DNS zones
-author: "Ricardo Carrillo Cruz (@rcarrillocruz)"
+author: OpenStack Ansible SIG
 description:
     - Manage OpenStack DNS zones. Zones can be created, deleted or
       updated. Only the I(email), I(description), I(ttl) and I(masters) values
@@ -114,128 +114,130 @@ zone:
             sample: []
 '''
 
-from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
 
 
-def _system_state_change(state, email, description, ttl, masters, zone):
+class DnsZoneModule(OpenStackModule):
-    if state == 'present':
-        if not zone:
-            return True
-        if email is not None and zone.email != email:
-            return True
-        if description is not None and zone.description != description:
-            return True
-        if ttl is not None and zone.ttl != ttl:
-            return True
-        if masters is not None and zone.masters != masters:
-            return True
-    if state == 'absent' and zone:
-        return True
-    return False
 
-
+    argument_spec = dict(
-def _wait(timeout, cloud, zone, state, module, sdk):
+        name=dict(required=True, type='str'),
-    """Wait for a zone to reach the desired state for the given state."""
+        zone_type=dict(required=False, choices=['primary', 'secondary'], type='str'),
-
+        email=dict(required=False, type='str'),
-    for count in sdk.utils.iterate_timeout(
+        description=dict(required=False, type='str'),
-            timeout,
+        ttl=dict(required=False, type='int'),
-            "Timeout waiting for zone to be %s" % state):
+        masters=dict(required=False, type='list', elements='str'),
-
+        state=dict(default='present', choices=['absent', 'present'], type='str'),
-        if (state == 'absent' and zone is None) or (state == 'present' and zone and zone.status == 'ACTIVE'):
-            return
-
-        try:
-            zone = cloud.get_zone(zone.id)
-        except Exception:
-            continue
-
-        if zone and zone.status == 'ERROR':
-            module.fail_json(msg="Zone reached ERROR state while waiting for it to be %s" % state)
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
-        name=dict(required=True),
-        zone_type=dict(required=False, choices=['primary', 'secondary']),
-        email=dict(required=False, default=None),
-        description=dict(required=False, default=None),
-        ttl=dict(required=False, default=None, type='int'),
-        masters=dict(required=False, default=None, type='list', elements='str'),
-        state=dict(default='present', choices=['absent', 'present']),
     )
 
-    module_kwargs = openstack_module_kwargs()
+    def _system_state_change(self, state, email, description, ttl, masters, zone):
-    module = AnsibleModule(argument_spec,
+        if state == 'present':
-                           supports_check_mode=True,
+            if not zone:
-                           **module_kwargs)
+                return True
+            if email is not None and zone.email != email:
+                return True
+            if description is not None and zone.description != description:
+                return True
+            if ttl is not None and zone.ttl != ttl:
+                return True
+            if masters is not None and zone.masters != masters:
+                return True
+        if state == 'absent' and zone:
+            return True
+        return False
 
-    name = module.params.get('name')
+    def _wait(self, timeout, zone, state):
-    state = module.params.get('state')
+        """Wait for a zone to reach the desired state for the given state."""
-    wait = module.params.get('wait')
-    timeout = module.params.get('timeout')
 
-    sdk, cloud = openstack_cloud_from_module(module)
+        for count in self.sdk.utils.iterate_timeout(
-    try:
+                timeout,
-        zone = cloud.get_zone(name)
+                "Timeout waiting for zone to be %s" % state):
+
+            if (state == 'absent' and zone is None) or (state == 'present' and zone and zone.status == 'ACTIVE'):
+                return
+
+            try:
+                zone = self.conn.get_zone(zone.id)
+            except Exception:
+                continue
+
+            if zone and zone.status == 'ERROR':
+                self.fail_json(msg="Zone reached ERROR state while waiting for it to be %s" % state)
+
+    def run(self):
+
+        name = self.params['name']
+        state = self.params['state']
+        wait = self.params['wait']
+        timeout = self.params['timeout']
+
+        zone = self.conn.get_zone(name)
 
         if state == 'present':
-            zone_type = module.params.get('zone_type')
-            email = module.params.get('email')
-            description = module.params.get('description')
-            ttl = module.params.get('ttl')
-            masters = module.params.get('masters')
 
-            if module.check_mode:
+            zone_type = self.params['zone_type']
-                module.exit_json(changed=_system_state_change(state, email,
+            email = self.params['email']
-                                                              description, ttl,
+            description = self.params['description']
-                                                              masters, zone))
+            ttl = self.params['ttl']
+            masters = self.params['masters']
+
+            kwargs = {}
+
+            if email:
+                kwargs['email'] = email
+            if description:
+                kwargs['description'] = description
+            if ttl:
+                kwargs['ttl'] = ttl
+            if masters:
+                kwargs['masters'] = masters
+
+            if self.ansible.check_mode:
+                self.exit_json(changed=self._system_state_change(state, email,
+                                                                 description, ttl,
+                                                                 masters, zone))
 
             if zone is None:
-                zone = cloud.create_zone(
+                zone = self.conn.create_zone(
-                    name=name, zone_type=zone_type, email=email,
+                    name=name, zone_type=zone_type, **kwargs)
-                    description=description, ttl=ttl, masters=masters)
                 changed = True
             else:
                 if masters is None:
                     masters = []
 
                 pre_update_zone = zone
-                changed = _system_state_change(state, email,
+                changed = self._system_state_change(state, email,
-                                               description, ttl,
+                                                    description, ttl,
-                                               masters, pre_update_zone)
+                                                    masters, pre_update_zone)
                 if changed:
-                    zone = cloud.update_zone(
+                    zone = self.conn.update_zone(
-                        name, email=email,
+                        name, **kwargs)
-                        description=description,
-                        ttl=ttl, masters=masters)
 
             if wait:
-                _wait(timeout, cloud, zone, state, module, sdk)
+                self._wait(timeout, zone, state)
 
-            module.exit_json(changed=changed, zone=zone)
+            self.exit_json(changed=changed, zone=zone)
 
         elif state == 'absent':
-            if module.check_mode:
+            if self.ansible.check_mode:
-                module.exit_json(changed=_system_state_change(state, None,
+                self.exit_json(changed=self._system_state_change(state, None,
-                                                              None, None,
+                                                                 None, None,
-                                                              None, zone))
+                                                                 None, zone))
 
             if zone is None:
                 changed = False
             else:
-                cloud.delete_zone(name)
+                self.conn.delete_zone(name)
                 changed = True
 
             if wait:
-                _wait(timeout, cloud, zone, state, module, sdk)
+                self._wait(timeout, zone, state)
 
-            module.exit_json(changed=changed)
+            self.exit_json(changed=changed)
 
-    except sdk.exceptions.OpenStackCloudException as e:
+
-        module.fail_json(msg=str(e))
+def main():
+    module = DnsZoneModule()
+    module()
 
 
 if __name__ == '__main__':

plugins/modules/dns_zone_info.py

@@ -0,0 +1,180 @@
+#!/usr/bin/python
+# coding: utf-8 -*-
+#
+# Copyright (c) 2021 by Open Telekom Cloud, operated by T-Systems International GmbH
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+
+DOCUMENTATION = '''
+---
+module: dns_zone_info
+short_description: Getting information about dns zones
+author: OpenStack Ansible SIG
+description:
+    - Getting information about dns zones. Output can be filtered.
+options:
+   name:
+     description:
+        - Zone name.
+     type: str
+   type:
+     description:
+        - Zone type.
+     choices: [primary, secondary]
+     type: str
+   email:
+     description:
+        - Email of the zone owner (only applies if zone_type is primary).
+     type: str
+   description:
+     description:
+        - Zone description.
+     type: str
+   ttl:
+     description:
+        -  TTL (Time To Live) value in seconds.
+     type: int
+
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
+
+extends_documentation_fragment:
+- openstack.cloud.openstack
+'''
+
+EXAMPLES = '''
+# Create a zone named "example.net"
+- openstack.cloud.dns_zones:
+
+'''
+
+RETURN = '''
+zone:
+    description: Dictionary describing the zone.
+    returned: On success when I(state) is 'present'.
+    type: complex
+    contains:
+        action:
+            description: Current action in progress on the resource.
+            type: str
+            sample: "CREATE"
+        attributes:
+            description: Key:Value pairs of information about this zone, and the pool the user would like to place \
+                the zone in. This information can be used by the scheduler to place zones on the correct pool.
+            type: dict
+            sample: {"tier": "gold", "ha": "true"}
+        created_at:
+            description: Date / Time when resource was created.
+            type: str
+            sample: "2014-07-07T18:25:31.275934"
+        description:
+            description: Description for this zone.
+            type: str
+            sample: "This is an example zone."
+        email:
+            description: E-mail for the zone. Used in SOA records for the zone.
+            type: str
+            sample: "test@example.org"
+        id:
+            description: ID for the resource.
+            type: int
+            sample: "a86dba58-0043-4cc6-a1bb-69d5e86f3ca3"
+        links:
+            description: Links to the resource, and other related resources. When a response has been broken into\
+                pages, we will include a next link that should be followed to retrieve all results.
+            type: dict
+            sample:  {"self": "https://127.0.0.1:9001/v2/zones/a86dba58-0043-4cc6-a1bb-69d5e86f3ca3"}
+        masters:
+            description: Mandatory for secondary zones. The servers to slave from to get DNS information.
+            type: list
+            sample: "[]"
+        name:
+            description: DNS Name for the zone.
+            type: str
+            sample: "test.test."
+        pool_id:
+            description: ID for the pool hosting this zone.
+            type: str
+            sample: "a86dba58-0043-4cc6-a1bb-69d5e86f3ca3"
+        project_id:
+            description: ID for the project that owns the resource.
+            type: str
+            sample: "4335d1f0-f793-11e2-b778-0800200c9a66"
+        serial:
+            description: Current serial number for the zone.
+            type: int
+            sample: 1404757531
+        status:
+            description: Status of the resource.
+            type: str
+            sample: "ACTIVE"
+        ttl:
+            description: TTL (Time to Live) for the zone.
+            type: int
+            sample: 7200
+        type:
+            description: Type of zone. PRIMARY is controlled by Designate, SECONDARY zones are slaved from another\
+                DNS Server. Defaults to PRIMARY
+            type: str
+            sample: "PRIMARY"
+        updated_at:
+            description: Date / Time when resource last updated.
+            type: str
+            sample: "2014-07-07T18:25:31.275934"
+'''
+
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
+
+
+class DnsZoneInfoModule(OpenStackModule):
+
+    argument_spec = dict(
+        name=dict(required=False, type='str'),
+        type=dict(required=False, choices=['primary', 'secondary'], type='str'),
+        email=dict(required=False, type='str'),
+        description=dict(required=False, type='str'),
+        ttl=dict(required=False, type='int')
+    )
+    module_kwargs = dict(
+        supports_check_mode=True
+    )
+
+    def run(self):
+
+        name = self.params['name']
+        type = self.params['type']
+        email = self.params['email']
+        description = self.params['description']
+        ttl = self.params['ttl']
+
+        kwargs = {}
+
+        if name:
+            kwargs['name'] = name
+        if type:
+            kwargs['type'] = type
+        if email:
+            kwargs['email'] = email
+        if description:
+            kwargs['description'] = description
+        if ttl:
+            kwargs['ttl'] = ttl
+
+        data = []
+
+        for raw in self.conn.dns.zones(**kwargs):
+            dt = raw.to_dict()
+            dt.pop('location')
+            data.append(dt)
+
+        self.exit_json(zones=data, changed=False)
+
+
+def main():
+    module = DnsZoneInfoModule()
+    module()
+
+
+if __name__ == '__main__':
+    main()

plugins/modules/endpoint.py

@@ -7,9 +7,7 @@ DOCUMENTATION = '''
 ---
 module: endpoint
 short_description: Manage OpenStack Identity service endpoints
-author:
+author: OpenStack Ansible SIG
-    - Mohammed Naser (@mnaser)
-    - Alberto Murillo (@albertomurillo)
 description:
     - Create, update, or delete OpenStack Identity service endpoints. If a
       service with the same combination of I(service), I(interface) and I(region)
@@ -105,35 +103,11 @@ endpoint:
             sample: True
 '''
 
-from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
 
 
-def _needs_update(module, endpoint):
+class IdentityEndpointModule(OpenStackModule):
-    if endpoint.enabled != module.params['enabled']:
+    argument_spec = dict(
-        return True
-    if endpoint.url != module.params['url']:
-        return True
-    return False
-
-
-def _system_state_change(module, endpoint):
-    state = module.params['state']
-    if state == 'absent' and endpoint:
-        return True
-
-    if state == 'present':
-        if endpoint is None:
-            return True
-        return _needs_update(module, endpoint)
-
-    return False
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
         service=dict(type='str', required=True),
         endpoint_interface=dict(type='str', required=True, choices=['admin', 'public', 'internal']),
         url=dict(type='str', required=True),
@@ -142,68 +116,89 @@ def main():
         state=dict(type='str', default='present', choices=['absent', 'present']),
     )
 
-    module_kwargs = openstack_module_kwargs()
+    module_kwargs = dict(
-    module = AnsibleModule(argument_spec,
+        supports_check_mode=True
-                           supports_check_mode=True,
+    )
-                           **module_kwargs)
 
-    service_name_or_id = module.params['service']
+    def _needs_update(self, endpoint):
-    interface = module.params['endpoint_interface']
+        if endpoint.enabled != self.params['enabled']:
-    url = module.params['url']
+            return True
-    region = module.params['region']
+        if endpoint.url != self.params['url']:
-    enabled = module.params['enabled']
+            return True
-    state = module.params['state']
+        return False
 
-    sdk, cloud = openstack_cloud_from_module(module)
+    def _system_state_change(self, endpoint):
-    try:
+        state = self.params['state']
+        if state == 'absent' and endpoint:
+            return True
 
-        service = cloud.get_service(service_name_or_id)
+        if state == 'present':
-        if service is None:
+            if endpoint is None:
-            module.fail_json(msg='Service %s does not exist' % service_name_or_id)
+                return True
+            return self._needs_update(endpoint)
+
+        return False
+
+    def run(self):
+        service_name_or_id = self.params['service']
+        interface = self.params['endpoint_interface']
+        url = self.params['url']
+        region = self.params['region']
+        enabled = self.params['enabled']
+        state = self.params['state']
+
+        service = self.conn.get_service(service_name_or_id)
+        if service is None and state == 'absent':
+            self.exit_json(changed=False)
+
+        elif service is None and state == 'present':
+            self.fail_json(msg='Service %s does not exist' % service_name_or_id)
 
         filters = dict(service_id=service.id, interface=interface)
         if region is not None:
             filters['region'] = region
-        endpoints = cloud.search_endpoints(filters=filters)
+        endpoints = self.conn.search_endpoints(filters=filters)
 
         if len(endpoints) > 1:
-            module.fail_json(msg='Service %s, interface %s and region %s are '
+            self.fail_json(msg='Service %s, interface %s and region %s are '
-                                 'not unique' %
+                           'not unique' %
-                                 (service_name_or_id, interface, region))
+                           (service_name_or_id, interface, region))
         elif len(endpoints) == 1:
             endpoint = endpoints[0]
         else:
             endpoint = None
 
-        if module.check_mode:
+        if self.ansible.check_mode:
-            module.exit_json(changed=_system_state_change(module, endpoint))
+            self.exit_json(changed=self._system_state_change(endpoint))
 
         if state == 'present':
             if endpoint is None:
-                result = cloud.create_endpoint(service_name_or_id=service,
+                result = self.conn.create_endpoint(
-                                               url=url, interface=interface,
+                    service_name_or_id=service, url=url, interface=interface,
-                                               region=region, enabled=enabled)
+                    region=region, enabled=enabled)
                 endpoint = result[0]
                 changed = True
             else:
-                if _needs_update(module, endpoint):
+                if self._needs_update(endpoint):
-                    endpoint = cloud.update_endpoint(
+                    endpoint = self.conn.update_endpoint(
                         endpoint.id, url=url, enabled=enabled)
                     changed = True
                 else:
                     changed = False
-            module.exit_json(changed=changed, endpoint=endpoint)
+            self.exit_json(changed=changed, endpoint=endpoint)
 
         elif state == 'absent':
             if endpoint is None:
                 changed = False
             else:
-                cloud.delete_endpoint(endpoint.id)
+                self.conn.delete_endpoint(endpoint.id)
                 changed = True
-            module.exit_json(changed=changed)
+            self.exit_json(changed=changed)
 
-    except sdk.exceptions.OpenStackCloudException as e:
+
-        module.fail_json(msg=str(e))
+def main():
+    module = IdentityEndpointModule()
+    module()
 
 
 if __name__ == '__main__':

plugins/modules/federation_idp.py

@@ -6,8 +6,7 @@ DOCUMENTATION = '''
 ---
 module: federation_idp
 short_description: manage a federation Identity Provider
-author:
+author: OpenStack Ansible SIG
-  - "Mark Chappell (@tremble) <mchappel@redhat.com>"
 description:
   - Manage a federation Identity Provider.
 options:
@@ -73,124 +72,11 @@ EXAMPLES = '''
 RETURN = '''
 '''
 
-from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module
 
 
-def normalize_idp(idp):
+class IdentityFederationIdpModule(OpenStackModule):
-    """
+    argument_spec = dict(
-    Normalizes the IDP definitions so that the outputs are consistent with the
-    parameters
-
-    - "enabled" (parameter) == "is_enabled" (SDK)
-    - "name" (parameter) == "id" (SDK)
-    """
-    if idp is None:
-        return None
-
-    _idp = idp.to_dict()
-    _idp['enabled'] = idp['is_enabled']
-    _idp['name'] = idp['id']
-    return _idp
-
-
-def delete_identity_provider(module, sdk, cloud, idp):
-    """
-    Delete an existing Identity Provider
-
-    returns: the "Changed" state
-    """
-
-    if idp is None:
-        return False
-
-    if module.check_mode:
-        return True
-
-    try:
-        cloud.identity.delete_identity_provider(idp)
-    except sdk.exceptions.OpenStackCloudException as ex:
-        module.fail_json(msg='Failed to delete identity provider: {0}'.format(str(ex)))
-    return True
-
-
-def create_identity_provider(module, sdk, cloud, name):
-    """
-    Create a new Identity Provider
-
-    returns: the "Changed" state and the new identity provider
-    """
-
-    if module.check_mode:
-        return True, None
-
-    description = module.params.get('description')
-    enabled = module.params.get('enabled')
-    domain_id = module.params.get('domain_id')
-    remote_ids = module.params.get('remote_ids')
-
-    if enabled is None:
-        enabled = True
-    if remote_ids is None:
-        remote_ids = []
-
-    attributes = {
-        'domain_id': domain_id,
-        'enabled': enabled,
-        'remote_ids': remote_ids,
-    }
-    if description is not None:
-        attributes['description'] = description
-
-    try:
-        idp = cloud.identity.create_identity_provider(id=name, **attributes)
-    except sdk.exceptions.OpenStackCloudException as ex:
-        module.fail_json(msg='Failed to create identity provider: {0}'.format(str(ex)))
-    return (True, idp)
-
-
-def update_identity_provider(module, sdk, cloud, idp):
-    """
-    Update an existing Identity Provider
-
-    returns: the "Changed" state and the new identity provider
-    """
-
-    description = module.params.get('description')
-    enabled = module.params.get('enabled')
-    domain_id = module.params.get('domain_id')
-    remote_ids = module.params.get('remote_ids')
-
-    attributes = {}
-
-    if (description is not None) and (description != idp.description):
-        attributes['description'] = description
-    if (enabled is not None) and (enabled != idp.is_enabled):
-        attributes['enabled'] = enabled
-    if (domain_id is not None) and (domain_id != idp.domain_id):
-        attributes['domain_id'] = domain_id
-    if (remote_ids is not None) and (remote_ids != idp.remote_ids):
-        attributes['remote_ids'] = remote_ids
-
-    if not attributes:
-        return False, idp
-
-    if module.check_mode:
-        return True, None
-
-    try:
-        new_idp = cloud.identity.update_identity_provider(idp, **attributes)
-    except sdk.exceptions.OpenStackCloudException as ex:
-        module.fail_json(msg='Failed to update identity provider: {0}'.format(str(ex)))
-    return (True, new_idp)
-
-
-def main():
-    """ Module entry point """
-
-    argument_spec = openstack_full_argument_spec(
         name=dict(required=True, aliases=['id']),
         state=dict(default='present', choices=['absent', 'present']),
         description=dict(),
@@ -198,45 +84,136 @@ def main():
         enabled=dict(type='bool', aliases=['is_enabled']),
         remote_ids=dict(type='list', elements='str'),
     )
-    module_kwargs = openstack_module_kwargs(
+    module_kwargs = dict(
-    )
-    module = AnsibleModule(
-        argument_spec,
         supports_check_mode=True,
-        **module_kwargs
     )
 
-    name = module.params.get('name')
+    def normalize_idp(self, idp):
-    state = module.params.get('state')
+        """
-    changed = False
+        Normalizes the IDP definitions so that the outputs are consistent with the
+        parameters
 
-    sdk, cloud = openstack_cloud_from_module(module, min_version="0.44")
+        - "enabled" (parameter) == "is_enabled" (SDK)
-
+        - "name" (parameter) == "id" (SDK)
-    try:
+        """
-        idp = cloud.identity.get_identity_provider(name)
-    except sdk.exceptions.ResourceNotFound:
-        idp = None
-    except sdk.exceptions.OpenStackCloudException as ex:
-        module.fail_json(msg='Failed to get identity provider: {0}'.format(str(ex)))
-
-    if state == 'absent':
-        if idp is not None:
-            changed = delete_identity_provider(module, sdk, cloud, idp)
-        module.exit_json(changed=changed)
-
-    # state == 'present'
-    else:
         if idp is None:
-            if module.params.get('domain_id') is None:
+            return None
-                module.fail_json(msg='A domain_id must be passed when creating'
-                                 ' an identity provider')
-            (changed, idp) = create_identity_provider(module, sdk, cloud, name)
-            idp = normalize_idp(idp)
-            module.exit_json(changed=changed, identity_provider=idp)
 
-        (changed, new_idp) = update_identity_provider(module, sdk, cloud, idp)
+        _idp = idp.to_dict()
-        new_idp = normalize_idp(new_idp)
+        _idp['enabled'] = idp['is_enabled']
-        module.exit_json(changed=changed, identity_provider=new_idp)
+        _idp['name'] = idp['id']
+        return _idp
+
+    def delete_identity_provider(self, idp):
+        """
+        Delete an existing Identity Provider
+
+        returns: the "Changed" state
+        """
+        if idp is None:
+            return False
+
+        if self.ansible.check_mode:
+            return True
+
+        self.conn.identity.delete_identity_provider(idp)
+        return True
+
+    def create_identity_provider(self, name):
+        """
+        Create a new Identity Provider
+
+        returns: the "Changed" state and the new identity provider
+        """
+
+        if self.ansible.check_mode:
+            return True, None
+
+        description = self.params.get('description')
+        enabled = self.params.get('enabled')
+        domain_id = self.params.get('domain_id')
+        remote_ids = self.params.get('remote_ids')
+
+        if enabled is None:
+            enabled = True
+        if remote_ids is None:
+            remote_ids = []
+
+        attributes = {
+            'domain_id': domain_id,
+            'enabled': enabled,
+            'remote_ids': remote_ids,
+        }
+        if description is not None:
+            attributes['description'] = description
+
+        idp = self.conn.identity.create_identity_provider(id=name, **attributes)
+        return (True, idp)
+
+    def update_identity_provider(self, idp):
+        """
+        Update an existing Identity Provider
+
+        returns: the "Changed" state and the new identity provider
+        """
+
+        description = self.params.get('description')
+        enabled = self.params.get('enabled')
+        domain_id = self.params.get('domain_id')
+        remote_ids = self.params.get('remote_ids')
+
+        attributes = {}
+
+        if (description is not None) and (description != idp.description):
+            attributes['description'] = description
+        if (enabled is not None) and (enabled != idp.is_enabled):
+            attributes['enabled'] = enabled
+        if (domain_id is not None) and (domain_id != idp.domain_id):
+            attributes['domain_id'] = domain_id
+        if (remote_ids is not None) and (remote_ids != idp.remote_ids):
+            attributes['remote_ids'] = remote_ids
+
+        if not attributes:
+            return False, idp
+
+        if self.ansible.check_mode:
+            return True, None
+
+        new_idp = self.conn.identity.update_identity_provider(idp, **attributes)
+        return (True, new_idp)
+
+    def run(self):
+        """ Module entry point """
+
+        name = self.params.get('name')
+        state = self.params.get('state')
+        changed = False
+
+        idp = self.conn.identity.find_identity_provider(name)
+
+        if state == 'absent':
+            if idp is not None:
+                changed = self.delete_identity_provider(idp)
+            self.exit_json(changed=changed)
+
+        # state == 'present'
+        else:
+            if idp is None:
+                if self.params.get('domain_id') is None:
+                    self.fail_json(msg='A domain_id must be passed when creating'
+                                   ' an identity provider')
+                (changed, idp) = self.create_identity_provider(name)
+                idp = self.normalize_idp(idp)
+                self.exit_json(changed=changed, identity_provider=idp)
+
+            (changed, new_idp) = self.update_identity_provider(idp)
+            new_idp = self.normalize_idp(new_idp)
+            self.exit_json(changed=changed, identity_provider=new_idp)
+
+
+def main():
+    module = IdentityFederationIdpModule()
+    module()
 
 
 if __name__ == '__main__':

plugins/modules/federation_idp_info.py

@@ -7,8 +7,7 @@ DOCUMENTATION = '''
 module: federation_idp_info
 short_description: Get the information about the available federation identity
                    providers
-author:
+author: OpenStack Ansible SIG
-  - "Mark Chappell (@tremble) <mchappel@redhat.com>"
 description:
   - Fetch a federation identity provider.
 options:
@@ -40,62 +39,50 @@ EXAMPLES = '''
 RETURN = '''
 '''
 
-from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module
 
 
-def normalize_idp(idp):
+class IdentityFederationIdpInfoModule(OpenStackModule):
-    """
+    argument_spec = dict(
-    Normalizes the IDP definitions so that the outputs are consistent with the
+        name=dict(aliases=['id']),
-    parameters
+    )
+    module_kwargs = dict(
+        supports_check_mode=True
+    )
 
-    - "enabled" (parameter) == "is_enabled" (SDK)
+    def normalize_idp(self, idp):
-    - "name" (parameter) == "id" (SDK)
+        """
-    """
+        Normalizes the IDP definitions so that the outputs are consistent with the
-    if idp is None:
+        parameters
-        return
 
-    _idp = idp.to_dict()
+        - "enabled" (parameter) == "is_enabled" (SDK)
-    _idp['enabled'] = idp['is_enabled']
+        - "name" (parameter) == "id" (SDK)
-    _idp['name'] = idp['id']
+        """
-    return _idp
+        if idp is None:
+            return
+
+        _idp = idp.to_dict()
+        _idp['enabled'] = idp['is_enabled']
+        _idp['name'] = idp['id']
+        return _idp
+
+    def run(self):
+        """ Module entry point """
+
+        name = self.params.get('name')
+
+        if name:
+            idp = self.normalize_idp(self.conn.identity.get_identity_provider(name))
+            self.exit_json(changed=False, identity_providers=[idp])
+
+        else:
+            providers = list(map(self.normalize_idp, self.conn.identity.identity_providers()))
+            self.exit_json(changed=False, identity_providers=providers)
 
 
 def main():
-    """ Module entry point """
+    module = IdentityFederationIdpInfoModule()
-
+    module()
-    argument_spec = openstack_full_argument_spec(
-        name=dict(aliases=['id']),
-    )
-    module_kwargs = openstack_module_kwargs(
-    )
-    module = AnsibleModule(
-        argument_spec,
-        supports_check_mode=True,
-        **module_kwargs
-    )
-
-    name = module.params.get('name')
-
-    sdk, cloud = openstack_cloud_from_module(module, min_version="0.44")
-
-    if name:
-        try:
-            idp = normalize_idp(cloud.identity.get_identity_provider(name))
-        except sdk.exceptions.ResourceNotFound:
-            module.fail_json(msg='Failed to find identity provider')
-        except sdk.exceptions.OpenStackCloudException as ex:
-            module.fail_json(msg='Failed to get identity provider: {0}'.format(str(ex)))
-        module.exit_json(changed=False, identity_providers=[idp])
-
-    else:
-        try:
-            providers = list(map(normalize_idp, cloud.identity.identity_providers()))
-        except sdk.exceptions.OpenStackCloudException as ex:
-            module.fail_json(msg='Failed to list identity providers: {0}'.format(str(ex)))
-        module.exit_json(changed=False, identity_providers=providers)
 
 
 if __name__ == '__main__':

plugins/modules/federation_mapping.py

@@ -6,8 +6,7 @@ DOCUMENTATION = '''
 ---
 module: federation_mapping
 short_description: Manage a federation mapping
-author:
+author: OpenStack Ansible SIG
-  - "Mark Chappell (@tremble) <mchappel@redhat.com>"
 description:
   - Manage a federation mapping.
 options:
@@ -79,93 +78,11 @@ EXAMPLES = '''
 RETURN = '''
 '''
 
-from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module
 
 
-def normalize_mapping(mapping):
+class IdentityFederationMappingModule(OpenStackModule):
-    """
+    argument_spec = dict(
-    Normalizes the mapping definitions so that the outputs are consistent with
-    the parameters
-
-    - "name" (parameter) == "id" (SDK)
-    """
-    if mapping is None:
-        return None
-
-    _mapping = mapping.to_dict()
-    _mapping['name'] = mapping['id']
-    return _mapping
-
-
-def create_mapping(module, sdk, cloud, name):
-    """
-    Attempt to create a Mapping
-
-    returns: A tuple containing the "Changed" state and the created mapping
-    """
-
-    if module.check_mode:
-        return (True, None)
-
-    rules = module.params.get('rules')
-
-    try:
-        mapping = cloud.identity.create_mapping(id=name, rules=rules)
-    except sdk.exceptions.OpenStackCloudException as ex:
-        module.fail_json(msg='Failed to create mapping: {0}'.format(str(ex)))
-    return (True, mapping)
-
-
-def delete_mapping(module, sdk, cloud, mapping):
-    """
-    Attempt to delete a Mapping
-
-    returns: the "Changed" state
-    """
-    if mapping is None:
-        return False
-
-    if module.check_mode:
-        return True
-
-    try:
-        cloud.identity.delete_mapping(mapping)
-    except sdk.exceptions.OpenStackCloudException as ex:
-        module.fail_json(msg='Failed to delete mapping: {0}'.format(str(ex)))
-    return True
-
-
-def update_mapping(module, sdk, cloud, mapping):
-    """
-    Attempt to delete a Mapping
-
-    returns: The "Changed" state and the the new mapping
-    """
-
-    current_rules = mapping.rules
-    new_rules = module.params.get('rules')
-
-    # Nothing to do
-    if current_rules == new_rules:
-        return (False, mapping)
-
-    if module.check_mode:
-        return (True, None)
-
-    try:
-        new_mapping = cloud.identity.update_mapping(mapping, rules=new_rules)
-    except sdk.exceptions.OpenStackCloudException as ex:
-        module.fail_json(msg='Failed to update mapping: {0}'.format(str(ex)))
-    return (True, new_mapping)
-
-
-def main():
-    """ Module entry point """
-
-    argument_spec = openstack_full_argument_spec(
         name=dict(required=True, aliases=['id']),
         state=dict(default='present', choices=['absent', 'present']),
         rules=dict(type='list', elements='dict', options=dict(
@@ -173,46 +90,107 @@ def main():
             remote=dict(required=True, type='list', elements='dict')
         )),
     )
-    module_kwargs = openstack_module_kwargs(
+    module_kwargs = dict(
-        required_if=[('state', 'present', ['rules'])]
+        required_if=[('state', 'present', ['rules'])],
-    )
+        supports_check_mode=True
-    module = AnsibleModule(
-        argument_spec,
-        supports_check_mode=True,
-        **module_kwargs
     )
 
-    name = module.params.get('name')
+    def normalize_mapping(self, mapping):
-    state = module.params.get('state')
+        """
-    changed = False
+        Normalizes the mapping definitions so that the outputs are consistent with
-
+        the parameters
-    sdk, cloud = openstack_cloud_from_module(module, min_version="0.44")
-
-    try:
-        mapping = cloud.identity.get_mapping(name)
-    except sdk.exceptions.ResourceNotFound:
-        mapping = None
-    except sdk.exceptions.OpenStackCloudException as ex:
-        module.fail_json(msg='Failed to fetch mapping: {0}'.format(str(ex)))
-
-    if state == 'absent':
-        if mapping is not None:
-            changed = delete_mapping(module, sdk, cloud, mapping)
-        module.exit_json(changed=changed)
-
-    # state == 'present'
-    else:
-        if len(module.params.get('rules')) < 1:
-            module.fail_json(msg='At least one rule must be passed')
 
+        - "name" (parameter) == "id" (SDK)
+        """
         if mapping is None:
-            (changed, mapping) = create_mapping(module, sdk, cloud, name)
+            return None
-            mapping = normalize_mapping(mapping)
+
-            module.exit_json(changed=changed, mapping=mapping)
+        _mapping = mapping.to_dict()
+        _mapping['name'] = mapping['id']
+        return _mapping
+
+    def create_mapping(self, name):
+        """
+        Attempt to create a Mapping
+
+        returns: A tuple containing the "Changed" state and the created mapping
+        """
+
+        if self.ansible.check_mode:
+            return (True, None)
+
+        rules = self.params.get('rules')
+
+        mapping = self.conn.identity.create_mapping(id=name, rules=rules)
+        return (True, mapping)
+
+    def delete_mapping(self, mapping):
+        """
+        Attempt to delete a Mapping
+
+        returns: the "Changed" state
+        """
+        if mapping is None:
+            return False
+
+        if self.ansible.check_mode:
+            return True
+
+        self.conn.identity.delete_mapping(mapping)
+        return True
+
+    def update_mapping(self, mapping):
+        """
+        Attempt to delete a Mapping
+
+        returns: The "Changed" state and the the new mapping
+        """
+
+        current_rules = mapping.rules
+        new_rules = self.params.get('rules')
+
+        # Nothing to do
+        if current_rules == new_rules:
+            return (False, mapping)
+
+        if self.ansible.check_mode:
+            return (True, None)
+
+        new_mapping = self.conn.identity.update_mapping(mapping, rules=new_rules)
+        return (True, new_mapping)
+
+    def run(self):
+        """ Module entry point """
+
+        name = self.params.get('name')
+        state = self.params.get('state')
+        changed = False
+
+        mapping = self.conn.identity.find_mapping(name)
+
+        if state == 'absent':
+            if mapping is not None:
+                changed = self.delete_mapping(mapping)
+            self.exit_json(changed=changed)
+
+        # state == 'present'
         else:
-            (changed, new_mapping) = update_mapping(module, sdk, cloud, mapping)
+            if len(self.params.get('rules')) < 1:
-            new_mapping = normalize_mapping(new_mapping)
+                self.fail_json(msg='At least one rule must be passed')
-            module.exit_json(mapping=new_mapping, changed=changed)
+
+            if mapping is None:
+                (changed, mapping) = self.create_mapping(name)
+                mapping = self.normalize_mapping(mapping)
+                self.exit_json(changed=changed, mapping=mapping)
+            else:
+                (changed, new_mapping) = self.update_mapping(mapping)
+                new_mapping = self.normalize_mapping(new_mapping)
+                self.exit_json(mapping=new_mapping, changed=changed)
+
+
+def main():
+    module = IdentityFederationMappingModule()
+    module()
 
 
 if __name__ == '__main__':

plugins/modules/federation_mapping_info.py

@@ -6,8 +6,7 @@ DOCUMENTATION = '''
 ---
 module: federation_mapping_info
 short_description: Get the information about the available federation mappings
-author:
+author: OpenStack Ansible SIG
-  - "Mark Chappell (@tremble) <mchappel@redhat.com>"
 description:
   - Fetch a federation mapping.
 options:
@@ -39,60 +38,50 @@ EXAMPLES = '''
 RETURN = '''
 '''
 
-from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module
 
 
-def normalize_mapping(mapping):
+class IdentityFederationMappingInfoModule(OpenStackModule):
-    """
+    argument_spec = dict(
-    Normalizes the mapping definitions so that the outputs are consistent with the
+        name=dict(aliases=['id']),
-    parameters
+    )
+    module_kwargs = dict(
+        supports_check_mode=True
+    )
 
-    - "name" (parameter) == "id" (SDK)
+    module_min_sdk_version = "0.44"
-    """
-    if mapping is None:
-        return None
 
-    _mapping = mapping.to_dict()
+    def normalize_mapping(self, mapping):
-    _mapping['name'] = mapping['id']
+        """
-    return _mapping
+        Normalizes the mapping definitions so that the outputs are consistent with the
+        parameters
+
+        - "name" (parameter) == "id" (SDK)
+        """
+        if mapping is None:
+            return None
+
+        _mapping = mapping.to_dict()
+        _mapping['name'] = mapping['id']
+        return _mapping
+
+    def run(self):
+        """ Module entry point """
+        name = self.params.get('name')
+
+        if name:
+            mapping = self.normalize_mapping(
+                self.conn.identity.get_mapping(name))
+            self.exit_json(changed=False, mappings=[mapping])
+        else:
+            mappings = list(map(
+                self.normalize_mapping, self.conn.identity.mappings()))
+            self.exit_json(changed=False, mappings=mappings)
 
 
 def main():
-    """ Module entry point """
+    module = IdentityFederationMappingInfoModule()
-
+    module()
-    argument_spec = openstack_full_argument_spec(
-        name=dict(aliases=['id']),
-    )
-    module_kwargs = openstack_module_kwargs(
-    )
-    module = AnsibleModule(
-        argument_spec,
-        supports_check_mode=True,
-        **module_kwargs
-    )
-
-    name = module.params.get('name')
-
-    sdk, cloud = openstack_cloud_from_module(module, min_version="0.44")
-
-    if name:
-        try:
-            mapping = normalize_mapping(cloud.identity.get_mapping(name))
-        except sdk.exceptions.ResourceNotFound:
-            module.fail_json(msg='Failed to find mapping')
-        except sdk.exceptions.OpenStackCloudException as ex:
-            module.fail_json(msg='Failed to get mapping: {0}'.format(str(ex)))
-        module.exit_json(changed=False, mappings=[mapping])
-
-    else:
-        try:
-            mappings = list(map(normalize_mapping, cloud.identity.mappings()))
-        except sdk.exceptions.OpenStackCloudException as ex:
-            module.fail_json(msg='Failed to list mappings: {0}'.format(str(ex)))
-        module.exit_json(changed=False, mappings=mappings)
 
 
 if __name__ == '__main__':

plugins/modules/floating_ip.py

@@ -6,11 +6,12 @@
 DOCUMENTATION = '''
 ---
 module: floating_ip
-author: Davide Guerri (@dguerri) <davide.guerri@hp.com>
+author: OpenStack Ansible SIG
 short_description: Add/Remove floating IP from an instance
 description:
    - Add or Remove a floating IP to an instance.
    - Returns the floating IP when attaching only if I(wait=true).
+   - When detaching a floating IP there might be a delay until an instance does not list the floating IP any more.
 options:
    server:
      description:
@@ -24,9 +25,9 @@ options:
      type: str
    floating_ip_address:
      description:
-        - A floating IP address to attach or to detach. Required only if I(state)
+        - A floating IP address to attach or to detach. When I(state) is present
-          is absent. When I(state) is present can be used to specify a IP address
+          can be used to specify a IP address to attach. I(floating_ip_address)
-          to attach.
+          requires I(network) to be set.
      type: str
    reuse:
      description:
@@ -49,7 +50,7 @@ options:
    wait:
      description:
         - When attaching a floating IP address, specify whether to wait for it to appear as attached.
-        - Must be set to C(yes) for the module to return the value of the floating IP.
+        - Must be set to C(yes) for the module to return the value of the floating IP when attaching.
      type: bool
      default: 'no'
    timeout:
@@ -79,7 +80,7 @@ extends_documentation_fragment:
 '''
 
 EXAMPLES = '''
-# Assign a floating IP to the fist interface of `cattle001` from an exiting
+# Assign a floating IP to the first interface of `cattle001` from an existing
 # external network or nova pool. A new floating IP from the first available
 # external network is allocated to the project.
 - openstack.cloud.floating_ip:
@@ -118,23 +119,12 @@ EXAMPLES = '''
      server: cattle001
 '''
 
-from ansible.module_utils.basic import AnsibleModule, remove_values
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
+import itertools
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
 
 
-def _get_floating_ip(cloud, floating_ip_address):
+class NetworkingFloatingIPModule(OpenStackModule):
-    f_ips = cloud.search_floating_ips(
+    argument_spec = dict(
-        filters={'floating_ip_address': floating_ip_address})
-    if not f_ips:
-        return None
-
-    return f_ips[0]
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
         server=dict(required=True),
         state=dict(default='present', choices=['absent', 'present']),
         network=dict(required=False, default=None),
@@ -148,107 +138,169 @@ def main():
         purge=dict(required=False, type='bool', default=False),
     )
 
-    module_kwargs = openstack_module_kwargs()
+    module_kwargs = dict(
-    module = AnsibleModule(argument_spec, **module_kwargs)
+        required_if=[
+            ['state', 'absent', ['floating_ip_address']]
+        ],
+        required_by=dict(
+            floating_ip_address=('network',)
+        )
+    )
 
-    server_name_or_id = module.params['server']
+    def _get_floating_ip(self, floating_ip_address):
-    state = module.params['state']
+        f_ips = self.conn.search_floating_ips(
-    network = module.params['network']
+            filters={'floating_ip_address': floating_ip_address})
-    floating_ip_address = module.params['floating_ip_address']
-    reuse = module.params['reuse']
-    fixed_address = module.params['fixed_address']
-    nat_destination = module.params['nat_destination']
-    wait = module.params['wait']
-    timeout = module.params['timeout']
-    purge = module.params['purge']
 
-    sdk, cloud = openstack_cloud_from_module(module)
+        if not f_ips:
-    try:
+            return None
 
-        server = cloud.get_server(server_name_or_id)
+        return f_ips[0]
-        if server is None:
+
-            module.fail_json(
+    def _list_floating_ips(self, server):
+        return itertools.chain.from_iterable([
+            (addr['addr'] for addr in server.addresses[net] if addr['OS-EXT-IPS:type'] == 'floating')
+            for net in server.addresses
+        ])
+
+    def _match_floating_ip(self, server,
+                           floating_ip_address,
+                           network_id,
+                           fixed_address,
+                           nat_destination):
+
+        if floating_ip_address:
+            return self._get_floating_ip(floating_ip_address)
+        elif not fixed_address and nat_destination:
+            nat_destination_name = self.conn.get_network(nat_destination)['name']
+            return next(
+                (self._get_floating_ip(addr['addr'])
+                 for addr in server.addresses.get(nat_destination_name, [])
+                 if addr['OS-EXT-IPS:type'] == 'floating'),
+                None)
+        else:
+            # not floating_ip_address and (fixed_address or not nat_destination)
+
+            # get any of the floating ips that matches fixed_address and/or network
+            f_ip_addrs = self._list_floating_ips(server)
+            f_ips = [f_ip for f_ip in self.conn.list_floating_ips() if f_ip['floating_ip_address'] in f_ip_addrs]
+            return next(
+                (f_ip for f_ip in f_ips
+                 if ((fixed_address and f_ip.fixed_ip_address == fixed_address) or not fixed_address)
+                 and ((network_id and f_ip.network == network_id) or not network_id)),
+                None)
+
+    def run(self):
+        server_name_or_id = self.params['server']
+        state = self.params['state']
+        network = self.params['network']
+        floating_ip_address = self.params['floating_ip_address']
+        reuse = self.params['reuse']
+        fixed_address = self.params['fixed_address']
+        nat_destination = self.params['nat_destination']
+        wait = self.params['wait']
+        timeout = self.params['timeout']
+        purge = self.params['purge']
+
+        server = self.conn.get_server(server_name_or_id)
+        if not server:
+            self.fail_json(
                 msg="server {0} not found".format(server_name_or_id))
 
+        # Extract floating ips from server
+        f_ip_addrs = self._list_floating_ips(server)
+
+        # Get details about requested floating ip
+        f_ip = self._get_floating_ip(floating_ip_address) if floating_ip_address else None
+
+        if network:
+            network_id = self.conn.get_network(name_or_id=network)["id"]
+        else:
+            network_id = None
+
         if state == 'present':
-            # If f_ip already assigned to server, check that it matches
+            if floating_ip_address and f_ip and floating_ip_address in f_ip_addrs:
-            # requirements.
+                # Floating ip address has been assigned to server
-            public_ip = cloud.get_server_public_ip(server)
+                self.exit_json(changed=False, floating_ip=f_ip)
-            f_ip = _get_floating_ip(cloud, public_ip) if public_ip else public_ip
-            if f_ip:
-                if network:
-                    network_id = cloud.get_network(name_or_id=network)["id"]
-                else:
-                    network_id = None
-                # check if we have floating ip on given nat_destination network
-                if nat_destination:
-                    nat_floating_addrs = [
-                        addr for addr in server.addresses.get(
-                            cloud.get_network(nat_destination)['name'], [])
-                        if addr['addr'] == public_ip
-                        and addr['OS-EXT-IPS:type'] == 'floating'
-                    ]
 
-                    if len(nat_floating_addrs) == 0:
+            if f_ip and f_ip['attached'] and floating_ip_address not in f_ip_addrs:
-                        module.fail_json(msg="server {server} already has a "
+                # Requested floating ip has been attached to different server
-                                             "floating-ip on a different "
+                self.fail_json(msg="floating-ip {floating_ip_address} already has been attached to different server"
-                                             "nat-destination than '{nat_destination}'"
+                                   .format(floating_ip_address=floating_ip_address))
-                                         .format(server=server_name_or_id,
-                                                 nat_destination=nat_destination))
 
-                if all([fixed_address, f_ip.fixed_ip_address == fixed_address,
+            if not floating_ip_address:
-                        network, f_ip.network != network_id]):
+                # No specific floating ip requested, i.e. if any floating ip is already assigned to server,
-                    # Current state definitely conflicts with requirements
+                # check that it matches requirements.
-                    module.fail_json(msg="server {server} already has a "
-                                         "floating-ip on requested "
-                                         "interface but it doesn't match "
-                                         "requested network {network}: {fip}"
-                                     .format(server=server_name_or_id,
-                                             network=network,
-                                             fip=remove_values(f_ip,
-                                                               module.no_log_values)))
-                if not network or f_ip.network == network_id:
-                    # Requirements are met
-                    module.exit_json(changed=False, floating_ip=f_ip)
 
-                # Requirements are vague enough to ignore existing f_ip and try
+                if not fixed_address and nat_destination:
-                # to create a new f_ip to the server.
+                    # Check if we have any floating ip on the given nat_destination network
+                    nat_destination_name = self.conn.get_network(nat_destination)['name']
+                    for addr in server.addresses.get(nat_destination_name, []):
+                        if addr['OS-EXT-IPS:type'] == 'floating':
+                            # A floating ip address has been assigned to the requested nat_destination
+                            f_ip = self._get_floating_ip(addr['addr'])
+                            self.exit_json(changed=False, floating_ip=f_ip)
+                # else fixed_address or not nat_destination, hence an
+                # analysis of all floating ips of server is required
+                f_ips = [f_ip for f_ip in self.conn.list_floating_ips() if f_ip['floating_ip_address'] in f_ip_addrs]
+                for f_ip in f_ips:
+                    if network_id and f_ip.network != network_id:
+                        # requested network does not match network of floating ip
+                        continue
 
-            server = cloud.add_ips_to_server(
+                    if not fixed_address and not nat_destination:
-                server=server, ips=floating_ip_address, ip_pool=network,
+                        # any floating ip will fullfil these requirements
-                reuse=reuse, fixed_address=fixed_address, wait=wait,
+                        self.exit_json(changed=False, floating_ip=f_ip)
+
+                    if fixed_address and f_ip.fixed_ip_address == fixed_address:
+                        # a floating ip address has been assigned that points to the requested fixed_address
+                        self.exit_json(changed=False, floating_ip=f_ip)
+
+            if floating_ip_address and not f_ip:
+                # openstacksdk's create_ip requires floating_ip_address and floating_network_id to be set
+                self.conn.network.create_ip(floating_ip_address=floating_ip_address, floating_network_id=network_id)
+            # Else floating ip either does not exist or has not been attached yet
+
+            # Both floating_ip_address and network are mutually exclusive in add_ips_to_server, i.e.
+            # add_ips_to_server will ignore floating_ip_address if network is set
+            # Ref.: https://github.com/openstack/openstacksdk/blob/a6b0ece2821ea79330c4067100295f6bdcbe456e/openstack/cloud/_floating_ip.py#L987
+            server = self.conn.add_ips_to_server(
+                server=server,
+                ips=floating_ip_address,
+                ip_pool=network if not floating_ip_address else None,
+                reuse=reuse,
+                fixed_address=fixed_address,
+                wait=wait,
                 timeout=timeout, nat_destination=nat_destination)
-            fip_address = cloud.get_server_public_ip(server)
+
-            # Update the floating IP status
+            # Update the floating ip status
-            f_ip = _get_floating_ip(cloud, fip_address)
+            f_ip = self._match_floating_ip(server, floating_ip_address, network_id, fixed_address, nat_destination)
-            module.exit_json(changed=True, floating_ip=f_ip)
+            self.exit_json(changed=True, floating_ip=f_ip)
 
         elif state == 'absent':
-            if floating_ip_address is None:
+            f_ip = self._match_floating_ip(server, floating_ip_address, network_id, fixed_address, nat_destination)
-                if not server_name_or_id:
-                    module.fail_json(msg="either server or floating_ip_address are required")
-                server = cloud.get_server(server_name_or_id)
-                floating_ip_address = cloud.get_server_public_ip(server)
-
-            f_ip = _get_floating_ip(cloud, floating_ip_address)
-
             if not f_ip:
                 # Nothing to detach
-                module.exit_json(changed=False)
+                self.exit_json(changed=False)
             changed = False
-            if f_ip["fixed_ip_address"]:
-                cloud.detach_ip_from_server(
-                    server_id=server['id'], floating_ip_id=f_ip['id'])
-                # Update the floating IP status
-                f_ip = cloud.get_floating_ip(id=f_ip['id'])
-                changed = True
-            if purge:
-                cloud.delete_floating_ip(f_ip['id'])
-                module.exit_json(changed=True)
-            module.exit_json(changed=changed, floating_ip=f_ip)
 
-    except sdk.exceptions.OpenStackCloudException as e:
+            if f_ip["fixed_ip_address"]:
-        module.fail_json(msg=str(e), extra_data=e.extra_data)
+                self.conn.detach_ip_from_server(server_id=server['id'], floating_ip_id=f_ip['id'])
+                # OpenStackSDK sets {"port_id": None} to detach a floating ip from an instance,
+                # but there might be a delay until a server does not list it in addresses any more.
+
+                # Update the floating IP status
+                f_ip = self.conn.get_floating_ip(id=f_ip['id'])
+                changed = True
+
+            if purge:
+                self.conn.delete_floating_ip(f_ip['id'])
+                self.exit_json(changed=True)
+            self.exit_json(changed=changed, floating_ip=f_ip)
+
+
+def main():
+    module = NetworkingFloatingIPModule()
+    module()
 
 
 if __name__ == '__main__':

plugins/modules/floating_ip_info.py

@@ -0,0 +1,214 @@
+#!/usr/bin/python
+# coding: utf-8 -*-
+#
+# Copyright (c) 2021 by Open Telekom Cloud, operated by T-Systems International GmbH
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+DOCUMENTATION = '''
+---
+module: floating_ip_info
+short_description: Get information about floating ips
+author: OpenStack Ansible SIG
+description:
+  - Get a generator of floating ips.
+options:
+  description:
+    description:
+      - The description of a floating IP.
+    type: str
+  fixed_ip_address:
+    description:
+      - The fixed IP address associated with a floating IP address.
+    type: str
+  floating_ip_address:
+    description:
+      -  The IP address of a floating IP.
+    type: str
+  floating_network:
+    description:
+      - The name or id of the network associated with a floating IP.
+    type: str
+  port:
+    description:
+      - The name or id of the port to which a floating IP is associated.
+    type: str
+  project_id:
+    description:
+      - The ID of the project a floating IP is associated with.
+    type: str
+  router:
+    description:
+      - The name or id of an associated router.
+    type: str
+  status:
+    description:
+      - The status of a floating IP, which can be ``ACTIVE``or ``DOWN``.
+    choices: ['active', 'down']
+    type: str
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
+
+extends_documentation_fragment:
+- openstack.cloud.openstack
+'''
+
+RETURN = '''
+floating_ips:
+  description: The floating ip objects list.
+  type: complex
+  returned: On Success.
+  contains:
+    created_at:
+      description: Timestamp at which the floating IP was assigned.
+      type: str
+    description:
+      description: The description of a floating IP.
+      type: str
+    dns_domain:
+      description: The DNS domain.
+      type: str
+    dns_name:
+      description: The DNS name.
+      type: str
+    fixed_ip_address:
+      description: The fixed IP address associated with a floating IP address.
+      type: str
+    floating_ip_address:
+      description: The IP address of a floating IP.
+      type: str
+    floating_network_id:
+      description: The id of the network associated with a floating IP.
+      type: str
+    id:
+      description: Id of the floating ip.
+      type: str
+    name:
+      description: Name of the floating ip.
+      type: str
+    port_details:
+      description: The details of the port that this floating IP associates \
+        with. Present if ``fip-port-details`` extension is loaded.
+      type: str
+    port_id:
+      description: The port ID floating ip associated with.
+      type: str
+    project_id:
+      description: The ID of the project this floating IP is associated with.
+      type: str
+    qos_policy_id:
+      description: The ID of the QoS policy attached to the floating IP.
+      type: str
+    revision_number:
+      description: Revision number.
+      type: str
+    router_id:
+      description: The id of the router floating ip associated with.
+      type: str
+    status:
+      description: The status of a floating IP, which can be ``ACTIVE``or ``DOWN``.\
+        Can be 'ACTIVE' and 'DOWN'.
+      type: str
+    subnet_id:
+      description: The id of the subnet the floating ip associated with.
+      type: str
+    tags:
+      description: List of tags.
+      type: str
+    updated_at:
+      description: Timestamp at which the floating IP was last updated.
+      type: str
+'''
+
+EXAMPLES = '''
+# Getting all floating ips
+- openstack.cloud.floating_ip_info:
+  register: fips
+
+# Getting fip by associated fixed IP address.
+- openstack.cloud.floating_ip_info:
+    fixed_ip_address: 192.168.10.8
+  register: fip
+
+# Getting fip by associated router.
+- openstack.cloud.floating_ip_info:
+    router: my-router
+  register: fip
+'''
+
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
+
+
+class FloatingIPInfoModule(OpenStackModule):
+    argument_spec = dict(
+        description=dict(required=False),
+        fixed_ip_address=dict(required=False),
+        floating_ip_address=dict(required=False),
+        floating_network=dict(required=False),
+        port=dict(required=False),
+        project_id=dict(required=False),
+        router=dict(required=False),
+        status=dict(required=False, choices=['active', 'down']),
+    )
+    module_kwargs = dict(
+        supports_check_mode=True
+    )
+
+    def run(self):
+
+        description = self.params['description']
+        fixed_ip_address = self.params['fixed_ip_address']
+        floating_ip_address = self.params['floating_ip_address']
+        floating_network = self.params['floating_network']
+        port = self.params['port']
+        project_id = self.params['project_id']
+        router = self.params['router']
+        status = self.params['status']
+
+        data = []
+        query = {}
+        if description:
+            query['description'] = description
+        if fixed_ip_address:
+            query['fixed_ip_address'] = fixed_ip_address
+        if floating_ip_address:
+            query['floating_ip_address'] = floating_ip_address
+        if floating_network:
+            try:
+                query['floating_network_id'] = self.conn.network.find_network(name_or_id=floating_network,
+                                                                              ignore_missing=False).id
+            except self.sdk.exceptions.ResourceNotFound:
+                self.fail_json(msg="floating_network not found")
+        if port:
+            try:
+                query['port_id'] = self.conn.network.find_port(name_or_id=port, ignore_missing=False).id
+            except self.sdk.exceptions.ResourceNotFound:
+                self.fail_json(msg="port not found")
+        if project_id:
+            query['project_id'] = project_id
+        if router:
+            try:
+                query['router_id'] = self.conn.network.find_router(name_or_id=router, ignore_missing=False).id
+            except self.sdk.exceptions.ResourceNotFound:
+                self.fail_json(msg="router not found")
+        if status:
+            query['status'] = status.upper()
+
+        for raw in self.conn.network.ips(**query):
+            dt = raw.to_dict()
+            dt.pop('location')
+            data.append(dt)
+
+        self.exit_json(
+            changed=False,
+            floating_ips=data
+        )
+
+
+def main():
+    module = FloatingIPInfoModule()
+    module()
+
+
+if __name__ == '__main__':
+    main()

plugins/modules/group_assignment.py

@@ -6,7 +6,7 @@ DOCUMENTATION = '''
 ---
 module: group_assignment
 short_description: Associate OpenStack Identity users and groups
-author: "Monty Taylor (@emonty)"
+author: OpenStack Ansible SIG
 description:
     - Add and remove users from groups
 options:
@@ -42,58 +42,54 @@ EXAMPLES = '''
   group: demo
 '''
 
-from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
 
 
-def _system_state_change(state, in_group):
+class IdentityGroupAssignment(OpenStackModule):
-    if state == 'present' and not in_group:
+    argument_spec = dict(
-        return True
-    if state == 'absent' and in_group:
-        return True
-    return False
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
         user=dict(required=True),
         group=dict(required=True),
         state=dict(default='present', choices=['absent', 'present']),
     )
 
-    module_kwargs = openstack_module_kwargs()
+    module_kwargs = dict(
-    module = AnsibleModule(argument_spec,
+        supports_check_mode=True
-                           supports_check_mode=True,
+    )
-                           **module_kwargs)
 
-    user = module.params['user']
+    def _system_state_change(self, state, in_group):
-    group = module.params['group']
+        if state == 'present' and not in_group:
-    state = module.params['state']
+            return True
+        if state == 'absent' and in_group:
+            return True
+        return False
 
-    sdk, cloud = openstack_cloud_from_module(module)
+    def run(self):
-    try:
+        user = self.params['user']
-        in_group = cloud.is_user_in_group(user, group)
+        group = self.params['group']
+        state = self.params['state']
 
-        if module.check_mode:
+        in_group = self.conn.is_user_in_group(user, group)
-            module.exit_json(changed=_system_state_change(state, in_group))
+
+        if self.ansible.check_mode:
+            self.exit_json(changed=self._system_state_change(state, in_group))
 
         changed = False
         if state == 'present':
             if not in_group:
-                cloud.add_user_to_group(user, group)
+                self.conn.add_user_to_group(user, group)
                 changed = True
 
         elif state == 'absent':
             if in_group:
-                cloud.remove_user_from_group(user, group)
+                self.conn.remove_user_from_group(user, group)
                 changed = True
 
-        module.exit_json(changed=changed)
+        self.exit_json(changed=changed)
 
-    except sdk.exceptions.OpenStackCloudException as e:
+
-        module.fail_json(msg=str(e), extra_data=e.extra_data)
+def main():
+    module = IdentityGroupAssignment()
+    module()
 
 
 if __name__ == '__main__':

plugins/modules/host_aggregate.py

@@ -6,7 +6,7 @@ DOCUMENTATION = '''
 ---
 module: host_aggregate
 short_description: Manage OpenStack host aggregates
-author: "Jakub Jursa (@kuboj)"
+author: OpenStack Ansible SIG
 description:
     - Create, update, or delete OpenStack host aggregates. If a aggregate
       with the supplied name already exists, it will be updated with the
@@ -77,69 +77,11 @@ RETURN = '''
 
 '''
 
-from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
 
 
-def _needs_update(module, aggregate):
+class ComputeHostAggregateModule(OpenStackModule):
-    new_metadata = (module.params['metadata'] or {})
+    argument_spec = dict(
-
-    if module.params['availability_zone'] is not None:
-        new_metadata['availability_zone'] = module.params['availability_zone']
-
-    if module.params['name'] != aggregate.name:
-        return True
-    if module.params['hosts'] is not None:
-        if module.params['purge_hosts']:
-            if set(module.params['hosts']) != set(aggregate.hosts):
-                return True
-        else:
-            intersection = set(module.params['hosts']).intersection(set(aggregate.hosts))
-            if set(module.params['hosts']) != intersection:
-                return True
-    if module.params['availability_zone'] is not None:
-        if module.params['availability_zone'] != aggregate.availability_zone:
-            return True
-    if module.params['metadata'] is not None:
-        if new_metadata != aggregate.metadata:
-            return True
-
-    return False
-
-
-def _system_state_change(module, aggregate):
-    state = module.params['state']
-    if state == 'absent' and aggregate:
-        return True
-
-    if state == 'present':
-        if aggregate is None:
-            return True
-        return _needs_update(module, aggregate)
-
-    return False
-
-
-def _update_hosts(cloud, aggregate, hosts, purge_hosts):
-    if hosts is None:
-        return
-
-    hosts_to_add = set(hosts) - set(aggregate.hosts)
-    for i in hosts_to_add:
-        cloud.add_host_to_aggregate(aggregate.id, i)
-
-    if not purge_hosts:
-        return
-
-    hosts_to_remove = set(aggregate.hosts) - set(hosts)
-    for i in hosts_to_remove:
-        cloud.remove_host_from_aggregate(aggregate.id, i)
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
         name=dict(required=True),
         metadata=dict(required=False, default=None, type='dict'),
         availability_zone=dict(required=False, default=None),
@@ -148,24 +90,74 @@ def main():
         state=dict(default='present', choices=['absent', 'present']),
     )
 
-    module_kwargs = openstack_module_kwargs()
+    module_kwargs = dict(
-    module = AnsibleModule(argument_spec,
+        supports_check_mode=True
-                           supports_check_mode=True,
+    )
-                           **module_kwargs)
 
-    name = module.params['name']
+    def _needs_update(self, aggregate):
-    metadata = module.params['metadata']
+        new_metadata = (self.params['metadata'] or {})
-    availability_zone = module.params['availability_zone']
-    hosts = module.params['hosts']
-    purge_hosts = module.params['purge_hosts']
-    state = module.params['state']
 
-    if metadata is not None:
+        if self.params['availability_zone'] is not None:
-        metadata.pop('availability_zone', None)
+            new_metadata['availability_zone'] = self.params['availability_zone']
 
-    sdk, cloud = openstack_cloud_from_module(module)
+        if self.params['name'] != aggregate.name:
-    try:
+            return True
-        aggregates = cloud.search_aggregates(name_or_id=name)
+        if self.params['hosts'] is not None:
+            if self.params['purge_hosts']:
+                if set(self.params['hosts']) != set(aggregate.hosts):
+                    return True
+            else:
+                intersection = set(self.params['hosts']).intersection(set(aggregate.hosts))
+                if set(self.params['hosts']) != intersection:
+                    return True
+        if self.params['availability_zone'] is not None:
+            if self.params['availability_zone'] != aggregate.availability_zone:
+                return True
+        if self.params['metadata'] is not None:
+            if new_metadata != aggregate.metadata:
+                return True
+
+        return False
+
+    def _system_state_change(self, aggregate):
+        state = self.params['state']
+        if state == 'absent' and aggregate:
+            return True
+
+        if state == 'present':
+            if aggregate is None:
+                return True
+            return self._needs_update(aggregate)
+
+        return False
+
+    def _update_hosts(self, aggregate, hosts, purge_hosts):
+        if hosts is None:
+            return
+
+        hosts_to_add = set(hosts) - set(aggregate.get("hosts", []))
+        for i in hosts_to_add:
+            self.conn.add_host_to_aggregate(aggregate.id, i)
+
+        if not purge_hosts:
+            return
+
+        hosts_to_remove = set(aggregate.get("hosts", [])) - set(hosts)
+        for i in hosts_to_remove:
+            self.conn.remove_host_from_aggregate(aggregate.id, i)
+
+    def run(self):
+        name = self.params['name']
+        metadata = self.params['metadata']
+        availability_zone = self.params['availability_zone']
+        hosts = self.params['hosts']
+        purge_hosts = self.params['purge_hosts']
+        state = self.params['state']
+
+        if metadata is not None:
+            metadata.pop('availability_zone', None)
+
+        aggregates = self.conn.search_aggregates(name_or_id=name)
 
         if len(aggregates) == 1:
             aggregate = aggregates[0]
@@ -174,45 +166,48 @@ def main():
         else:
             raise Exception("Should not happen")
 
-        if module.check_mode:
+        if self.ansible.check_mode:
-            module.exit_json(changed=_system_state_change(module, aggregate))
+            self.exit_json(changed=self._system_state_change(aggregate))
 
         if state == 'present':
             if aggregate is None:
-                aggregate = cloud.create_aggregate(name=name,
+                aggregate = self.conn.create_aggregate(
-                                                   availability_zone=availability_zone)
+                    name=name, availability_zone=availability_zone)
-                _update_hosts(cloud, aggregate, hosts, False)
+                self._update_hosts(aggregate, hosts, False)
                 if metadata:
-                    cloud.set_aggregate_metadata(aggregate.id, metadata)
+                    self.conn.set_aggregate_metadata(aggregate.id, metadata)
                 changed = True
             else:
-                if _needs_update(module, aggregate):
+                if self._needs_update(aggregate):
                     if availability_zone is not None:
-                        aggregate = cloud.update_aggregate(aggregate.id, name=name,
+                        aggregate = self.conn.update_aggregate(
-                                                           availability_zone=availability_zone)
+                            aggregate.id, name=name,
+                            availability_zone=availability_zone)
                     if metadata is not None:
                         metas = metadata
                         for i in (set(aggregate.metadata.keys()) - set(metadata.keys())):
                             if i != 'availability_zone':
                                 metas[i] = None
-                        cloud.set_aggregate_metadata(aggregate.id, metas)
+                        self.conn.set_aggregate_metadata(aggregate.id, metas)
-                    _update_hosts(cloud, aggregate, hosts, purge_hosts)
+                    self._update_hosts(aggregate, hosts, purge_hosts)
                     changed = True
                 else:
                     changed = False
-            module.exit_json(changed=changed)
+            self.exit_json(changed=changed)
 
         elif state == 'absent':
             if aggregate is None:
                 changed = False
             else:
-                _update_hosts(cloud, aggregate, [], True)
+                self._update_hosts(aggregate, [], True)
-                cloud.delete_aggregate(aggregate.id)
+                self.conn.delete_aggregate(aggregate.id)
                 changed = True
-            module.exit_json(changed=changed)
+            self.exit_json(changed=changed)
 
-    except sdk.exceptions.OpenStackCloudException as e:
+
-        module.fail_json(msg=str(e))
+def main():
+    module = ComputeHostAggregateModule()
+    module()
 
 
 if __name__ == '__main__':

plugins/modules/identity_domain.py

@@ -6,9 +6,7 @@ DOCUMENTATION = '''
 ---
 module: identity_domain
 short_description: Manage OpenStack Identity Domains
-author:
+author: OpenStack Ansible SIG
-    - Monty Taylor (@emonty)
-    - Haneef Ali (@haneefs)
 description:
     - Create, update, or delete OpenStack Identity domains. If a domain
       with the supplied name already exists, it will be updated with the
@@ -87,92 +85,90 @@ id:
     sample: "474acfe5-be34-494c-b339-50f06aa143e4"
 '''
 
-from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
 
 
-def _needs_update(module, domain):
+class IdentityDomainModule(OpenStackModule):
-    if module.params['description'] is not None and \
+    argument_spec = dict(
-       domain.description != module.params['description']:
-        return True
-    if domain.enabled != module.params['enabled']:
-        return True
-    return False
-
-
-def _system_state_change(module, domain):
-    state = module.params['state']
-    if state == 'absent' and domain:
-        return True
-
-    if state == 'present':
-        if domain is None:
-            return True
-        return _needs_update(module, domain)
-
-    return False
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
         name=dict(required=True),
         description=dict(default=None),
         enabled=dict(default=True, type='bool'),
         state=dict(default='present', choices=['absent', 'present']),
     )
 
-    module_kwargs = openstack_module_kwargs()
+    module_kwargs = dict(
-    module = AnsibleModule(argument_spec,
+        supports_check_mode=True
-                           supports_check_mode=True,
+    )
-                           **module_kwargs)
 
-    name = module.params['name']
+    def _needs_update(self, domain):
-    description = module.params['description']
+        if self.params['description'] is not None and \
-    enabled = module.params['enabled']
+           domain.description != self.params['description']:
-    state = module.params['state']
+            return True
+        if domain.get(
+                "is_enabled", domain.get("enabled")) != self.params['enabled']:
+            return True
+        return False
 
-    sdk, cloud = openstack_cloud_from_module(module)
+    def _system_state_change(self, domain):
-    try:
+        state = self.params['state']
+        if state == 'absent' and domain:
+            return True
 
-        domains = cloud.search_domains(filters=dict(name=name))
+        if state == 'present':
+            if domain is None:
+                return True
+            return self._needs_update(domain)
+
+        return False
+
+    def run(self):
+        name = self.params['name']
+        description = self.params['description']
+        enabled = self.params['enabled']
+        state = self.params['state']
+
+        domains = list(self.conn.identity.domains(name=name))
 
         if len(domains) > 1:
-            module.fail_json(msg='Domain name %s is not unique' % name)
+            self.fail_json(msg='Domain name %s is not unique' % name)
         elif len(domains) == 1:
             domain = domains[0]
         else:
             domain = None
 
-        if module.check_mode:
+        if self.ansible.check_mode:
-            module.exit_json(changed=_system_state_change(module, domain))
+            self.exit_json(changed=self._system_state_change(domain))
 
         if state == 'present':
             if domain is None:
-                domain = cloud.create_domain(
+                domain = self.conn.create_domain(
                     name=name, description=description, enabled=enabled)
                 changed = True
             else:
-                if _needs_update(module, domain):
+                if self._needs_update(domain):
-                    domain = cloud.update_domain(
+                    domain = self.conn.update_domain(
                         domain.id, name=name, description=description,
                         enabled=enabled)
                     changed = True
                 else:
                     changed = False
-            module.exit_json(changed=changed, domain=domain, id=domain.id)
+            if hasattr(domain, "to_dict"):
+                domain = domain.to_dict()
+                domain.pop("location")
+            self.exit_json(changed=changed, domain=domain, id=domain['id'])
 
         elif state == 'absent':
             if domain is None:
                 changed = False
             else:
-                cloud.delete_domain(domain.id)
+                self.conn.delete_domain(domain.id)
                 changed = True
-            module.exit_json(changed=changed)
+            self.exit_json(changed=changed)
 
-    except sdk.exceptions.OpenStackCloudException as e:
+
-        module.fail_json(msg=str(e))
+def main():
+    module = IdentityDomainModule()
+    module()
 
 
 if __name__ == '__main__':

plugins/modules/identity_domain_info.py

@@ -6,7 +6,7 @@ DOCUMENTATION = '''
 ---
 module: identity_domain_info
 short_description: Retrieve information about one or more OpenStack domains
-author: "Ricardo Carrillo Cruz (@rcarrillocruz)"
+author: OpenStack Ansible SIG
 description:
     - Retrieve information about a one or more OpenStack domains
     - This module was called C(openstack.cloud.identity_domain_facts) before Ansible 2.9, returning C(ansible_facts).
@@ -81,52 +81,43 @@ openstack_domains:
             type: bool
 '''
 
-from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
 
 
-def main():
+class IdentityDomainInfoModule(OpenStackModule):
-
+    argument_spec = dict(
-    argument_spec = openstack_full_argument_spec(
         name=dict(required=False, default=None),
         filters=dict(required=False, type='dict', default=None),
     )
-    module_kwargs = openstack_module_kwargs(
+    module_kwargs = dict(
         mutually_exclusive=[
             ['name', 'filters'],
-        ]
+        ],
+        supports_check_mode=True
     )
-    module = AnsibleModule(argument_spec, **module_kwargs)
-    is_old_facts = module._name == 'openstack.cloud.identity_domain_facts'
-    if is_old_facts:
-        module.deprecate("The 'openstack.cloud.identity_domain_facts' module has been renamed to 'openstack.cloud.identity_domain_info', "
-                         "and the renamed one no longer returns ansible_facts", version='2.13')
 
-    sdk, opcloud = openstack_cloud_from_module(module)
+    deprecated_names = ('openstack.cloud.identity_domain_facts')
-    try:
+
-        name = module.params['name']
+    def run(self):
-        filters = module.params['filters']
+        name = self.params['name']
+        filters = self.params['filters']
 
         if name:
             # Let's suppose user is passing domain ID
             try:
-                domains = opcloud.get_domain(name)
+                domains = self.conn.get_domain(name)
             except Exception:
-                domains = opcloud.search_domains(filters={'name': name})
+                domains = self.conn.search_domains(filters={'name': name})
 
         else:
-            domains = opcloud.search_domains(filters)
+            domains = self.conn.search_domains(filters)
 
-        if is_old_facts:
+        self.exit_json(changed=False, openstack_domains=domains)
-            module.exit_json(changed=False, ansible_facts=dict(
-                openstack_domains=domains))
-        else:
-            module.exit_json(changed=False, openstack_domains=domains)
 
-    except sdk.exceptions.OpenStackCloudException as e:
+
-        module.fail_json(msg=str(e))
+def main():
+    module = IdentityDomainInfoModule()
+    module()
 
 
 if __name__ == '__main__':

plugins/modules/identity_group.py

@@ -6,7 +6,7 @@ DOCUMENTATION = '''
 ---
 module: identity_group
 short_description: Manage OpenStack Identity Groups
-author: "Monty Taylor (@emonty), David Shrewsbury (@Shrews)"
+author: OpenStack Ansible SIG
 description:
     - Manage OpenStack Identity Groups. Groups can be created, deleted or
       updated. Only the I(description) value can be updated.
@@ -86,75 +86,71 @@ group:
             sample: "default"
 '''
 
-from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
 
 
-def _system_state_change(state, description, group):
+class IdentityGroupModule(OpenStackModule):
-    if state == 'present' and not group:
+    argument_spec = dict(
-        return True
-    if state == 'present' and description is not None and group.description != description:
-        return True
-    if state == 'absent' and group:
-        return True
-    return False
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
         name=dict(required=True),
         description=dict(required=False, default=None),
         domain_id=dict(required=False, default=None),
         state=dict(default='present', choices=['absent', 'present']),
     )
 
-    module_kwargs = openstack_module_kwargs()
+    module_kwargs = dict(
-    module = AnsibleModule(argument_spec,
+        supports_check_mode=True
-                           supports_check_mode=True,
+    )
-                           **module_kwargs)
 
-    name = module.params.get('name')
+    def _system_state_change(self, state, description, group):
-    description = module.params.get('description')
+        if state == 'present' and not group:
-    state = module.params.get('state')
+            return True
+        if state == 'present' and description is not None and group.description != description:
+            return True
+        if state == 'absent' and group:
+            return True
+        return False
 
-    domain_id = module.params.pop('domain_id')
+    def run(self):
+        name = self.params.get('name')
+        description = self.params.get('description')
+        state = self.params.get('state')
+
+        domain_id = self.params.pop('domain_id')
 
-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
         if domain_id:
-            group = cloud.get_group(name, filters={'domain_id': domain_id})
+            group = self.conn.get_group(name, filters={'domain_id': domain_id})
         else:
-            group = cloud.get_group(name)
+            group = self.conn.get_group(name)
 
-        if module.check_mode:
+        if self.ansible.check_mode:
-            module.exit_json(changed=_system_state_change(state, description, group))
+            self.exit_json(changed=self._system_state_change(state, description, group))
 
         if state == 'present':
             if group is None:
-                group = cloud.create_group(
+                group = self.conn.create_group(
                     name=name, description=description, domain=domain_id)
                 changed = True
             else:
                 if description is not None and group.description != description:
-                    group = cloud.update_group(
+                    group = self.conn.update_group(
                         group.id, description=description)
                     changed = True
                 else:
                     changed = False
-            module.exit_json(changed=changed, group=group)
+            self.exit_json(changed=changed, group=group)
 
         elif state == 'absent':
             if group is None:
                 changed = False
             else:
-                cloud.delete_group(group.id)
+                self.conn.delete_group(group.id)
                 changed = True
-            module.exit_json(changed=changed)
+            self.exit_json(changed=changed)
 
-    except sdk.exceptions.OpenStackCloudException as e:
+
-        module.fail_json(msg=str(e))
+def main():
+    module = IdentityGroupModule()
+    module()
 
 
 if __name__ == '__main__':

plugins/modules/identity_group_info.py

@@ -7,7 +7,7 @@ DOCUMENTATION = '''
 ---
 module: identity_group_info
 short_description: Retrieve info about one or more OpenStack groups
-author: "Phillipe Smith (@phsmith)"
+author: OpenStack Ansible SIG
 description:
     - Retrieve info about a one or more OpenStack groups.
 options:
@@ -110,48 +110,48 @@ openstack_groups:
             type: bool
 '''
 
-from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec, openstack_cloud_from_module
 
 
-def main():
+class IdentityGroupInfoModule(OpenStackModule):
-
+    argument_spec = dict(
-    argument_spec = openstack_full_argument_spec(
         name=dict(required=False, default=None),
         domain=dict(required=False, default=None),
         filters=dict(required=False, type='dict', default=None),
     )
+    module_kwargs = dict(
+        supports_check_mode=True
+    )
 
-    module = AnsibleModule(argument_spec)
+    def run(self):
-
+        name = self.params['name']
-    sdk, opcloud = openstack_cloud_from_module(module)
+        domain = self.params['domain']
-    try:
+        filters = self.params['filters']
-        name = module.params['name']
-        domain = module.params['domain']
-        filters = module.params['filters']
 
         if domain:
             try:
                 # We assume admin is passing domain id
-                dom = opcloud.get_domain(domain)['id']
+                dom = self.conn.get_domain(domain)['id']
                 domain = dom
             except Exception:
                 # If we fail, maybe admin is passing a domain name.
                 # Note that domains have unique names, just like id.
-                dom = opcloud.search_domains(filters={'name': domain})
+                dom = self.conn.search_domains(filters={'name': domain})
                 if dom:
                     domain = dom[0]['id']
                 else:
-                    module.fail_json(msg='Domain name or ID does not exist')
+                    self.fail_json(msg='Domain name or ID does not exist')
 
             if not filters:
                 filters = {}
 
-        groups = opcloud.search_groups(name, filters, domain_id=domain)
+        groups = self.conn.search_groups(name, filters, domain_id=domain)
-        module.exit_json(changed=False, groups=groups)
+        self.exit_json(changed=False, groups=groups)
 
-    except sdk.exceptions.OpenStackCloudException as e:
+
-        module.fail_json(msg=str(e))
+def main():
+    module = IdentityGroupInfoModule()
+    module()
 
 
 if __name__ == '__main__':

plugins/modules/identity_role.py

@@ -6,9 +6,7 @@ DOCUMENTATION = '''
 ---
 module: identity_role
 short_description: Manage OpenStack Identity Roles
-author:
+author: OpenStack Ansible SIG
-  - Monty Taylor (@emonty)
-  - David Shrewsbury (@Shrews)
 description:
     - Manage OpenStack Identity Roles.
 options:
@@ -61,58 +59,54 @@ role:
             sample: "demo"
 '''
 
-from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
 
 
-def _system_state_change(state, role):
+class IdentityRoleModule(OpenStackModule):
-    if state == 'present' and not role:
+    argument_spec = dict(
-        return True
-    if state == 'absent' and role:
-        return True
-    return False
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
         name=dict(required=True),
         state=dict(default='present', choices=['absent', 'present']),
     )
 
-    module_kwargs = openstack_module_kwargs()
+    module_kwargs = dict(
-    module = AnsibleModule(argument_spec,
+        supports_check_mode=True
-                           supports_check_mode=True,
+    )
-                           **module_kwargs)
 
-    name = module.params.get('name')
+    def _system_state_change(self, state, role):
-    state = module.params.get('state')
+        if state == 'present' and not role:
+            return True
+        if state == 'absent' and role:
+            return True
+        return False
 
-    sdk, cloud = openstack_cloud_from_module(module)
+    def run(self):
-    try:
+        name = self.params.get('name')
-        role = cloud.get_role(name)
+        state = self.params.get('state')
 
-        if module.check_mode:
+        role = self.conn.get_role(name)
-            module.exit_json(changed=_system_state_change(state, role))
+
+        if self.ansible.check_mode:
+            self.exit_json(changed=self._system_state_change(state, role))
 
         if state == 'present':
             if role is None:
-                role = cloud.create_role(name)
+                role = self.conn.create_role(name)
                 changed = True
             else:
                 changed = False
-            module.exit_json(changed=changed, role=role)
+            self.exit_json(changed=changed, role=role)
         elif state == 'absent':
             if role is None:
                 changed = False
             else:
-                cloud.delete_role(name)
+                self.conn.delete_role(name)
                 changed = True
-            module.exit_json(changed=changed)
+            self.exit_json(changed=changed)
 
-    except sdk.exceptions.OpenStackCloudException as e:
+
-        module.fail_json(msg=str(e))
+def main():
+    module = IdentityRoleModule()
+    module()
 
 
 if __name__ == '__main__':

plugins/modules/identity_role_info.py

@@ -0,0 +1,103 @@
+#!/usr/bin/python
+# coding: utf-8 -*-
+
+# Copyright (c) 2020, Sagi Shnaidman <sshnaidm@redhat.com>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+DOCUMENTATION = '''
+---
+module: identity_role_info
+short_description: Retrive information about roles
+author: OpenStack Ansible SIG
+description:
+  - Get information about identity roles in Openstack
+options:
+  domain_id:
+    description:
+      - List roles in specified domain only
+    type: str
+    required: false
+  name:
+    description:
+      - List role speficied by name
+    type: str
+    required: false
+
+requirements:
+  - "python >= 3.6"
+  - "openstacksdk"
+
+extends_documentation_fragment:
+  - openstack.cloud.openstack
+'''
+
+RETURN = '''
+openstack_roles:
+  description: List of identity roles
+  returned: always
+  type: list
+  elements: dict
+  sample:
+  - domain_id: None
+    id: 19bf514fdda84f808ccee8463bd85c1a
+    location:
+      cloud: mycloud
+      project:
+        domain_id: None
+        domain_name: None
+        id: None
+        name: None
+      region_name: None
+      zone: None
+    name: member
+    properties:
+
+'''
+
+EXAMPLES = '''
+# Retrieve info about all roles
+- openstack.cloud.identity_role_info:
+    cloud: mycloud
+
+# Retrieve info about all roles in specific domain
+- openstack.cloud.identity_role_info:
+    cloud: mycloud
+    domain_id: some_domain_id
+
+# Retrieve info about role 'admin'
+- openstack.cloud.identity_role_info:
+    cloud: mycloud
+    name: admin
+
+'''
+
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
+
+
+class IdentityRoleInfoModule(OpenStackModule):
+
+    argument_spec = dict(
+        domain_id=dict(type='str', required=False),
+        name=dict(type='str', required=False),
+    )
+    module_kwargs = dict(
+        supports_check_mode=True,
+    )
+
+    def run(self):
+        roles = self.conn.list_roles(domain_id=self.params['domain_id'])
+        # Dictionaries are supported from Train release
+        roles = [item if isinstance(item, dict) else item.to_dict() for item in roles]
+        # Filtering by name is supported from Wallaby release
+        if self.params['name']:
+            roles = [item for item in roles if self.params['name'] in (item['id'], item['name'])]
+        self.results.update({'openstack_roles': roles})
+
+
+def main():
+    module = IdentityRoleInfoModule()
+    module()
+
+
+if __name__ == '__main__':
+    main()

plugins/modules/identity_user.py

@@ -6,7 +6,7 @@ DOCUMENTATION = '''
 ---
 module: identity_user
 short_description: Manage OpenStack Identity Users
-author: David Shrewsbury (@Shrews)
+author: OpenStack Ansible SIG
 description:
     - Manage OpenStack Identity users. Users can be created,
       updated or deleted using this module. A user will be updated
@@ -131,54 +131,12 @@ user:
             type: str
             sample: "demouser"
 '''
-from ansible.module_utils.basic import AnsibleModule
+
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
 
 
-def _needs_update(params_dict, user):
+class IdentityUserModule(OpenStackModule):
-    for k in params_dict:
+    argument_spec = dict(
-        if k not in ('password', 'update_password') and user[k] != params_dict[k]:
-            return True
-
-    # We don't get password back in the user object, so assume any supplied
-    # password is a change.
-    if (
-        params_dict['password'] is not None
-        and params_dict['update_password'] == 'always'
-    ):
-        return True
-
-    return False
-
-
-def _get_domain_id(cloud, domain):
-    try:
-        # We assume admin is passing domain id
-        domain_id = cloud.get_domain(domain)['id']
-    except Exception:
-        # If we fail, maybe admin is passing a domain name.
-        # Note that domains have unique names, just like id.
-        try:
-            domain_id = cloud.search_domains(filters={'name': domain})[0]['id']
-        except Exception:
-            # Ok, let's hope the user is non-admin and passing a sane id
-            domain_id = domain
-
-    return domain_id
-
-
-def _get_default_project_id(cloud, default_project, domain_id, module):
-    project = cloud.get_project(default_project, domain_id=domain_id)
-    if not project:
-        module.fail_json(msg='Default project %s is not valid' % default_project)
-
-    return project['id']
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
         name=dict(required=True),
         password=dict(required=False, default=None, no_log=True),
         email=dict(required=False, default=None),
@@ -190,47 +148,81 @@ def main():
         update_password=dict(default=None, choices=['always', 'on_create']),
     )
 
-    module_kwargs = openstack_module_kwargs()
+    module_kwargs = dict()
-    module = AnsibleModule(
-        argument_spec,
-        **module_kwargs)
 
-    name = module.params['name']
+    def _needs_update(self, params_dict, user):
-    password = module.params.get('password')
+        for k in params_dict:
-    email = module.params['email']
+            if k not in ('password', 'update_password') and user[k] != params_dict[k]:
-    default_project = module.params['default_project']
+                return True
-    domain = module.params['domain']
+
-    enabled = module.params['enabled']
+        # We don't get password back in the user object, so assume any supplied
-    state = module.params['state']
+        # password is a change.
-    update_password = module.params['update_password']
+        if (
-    description = module.params['description']
+            params_dict['password'] is not None
+            and params_dict['update_password'] == 'always'
+        ):
+            return True
+
+        return False
+
+    def _get_domain_id(self, domain):
+        try:
+            # We assume admin is passing domain id
+            domain_id = self.conn.get_domain(domain)['id']
+        except Exception:
+            # If we fail, maybe admin is passing a domain name.
+            # Note that domains have unique names, just like id.
+            try:
+                domain_id = self.conn.search_domains(filters={'name': domain})[0]['id']
+            except Exception:
+                # Ok, let's hope the user is non-admin and passing a sane id
+                domain_id = domain
+
+        return domain_id
+
+    def _get_default_project_id(self, default_project, domain_id):
+        project = self.conn.get_project(default_project, domain_id=domain_id)
+        if not project:
+            self.fail_json(msg='Default project %s is not valid' % default_project)
+
+        return project['id']
+
+    def run(self):
+        name = self.params['name']
+        password = self.params.get('password')
+        email = self.params['email']
+        default_project = self.params['default_project']
+        domain = self.params['domain']
+        enabled = self.params['enabled']
+        state = self.params['state']
+        update_password = self.params['update_password']
+        description = self.params['description']
 
-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
         domain_id = None
         if domain:
-            domain_id = _get_domain_id(cloud, domain)
+            domain_id = self._get_domain_id(domain)
-            user = cloud.get_user(name, domain_id=domain_id)
+            user = self.conn.get_user(name, domain_id=domain_id)
         else:
-            user = cloud.get_user(name)
+            user = self.conn.get_user(name)
 
         if state == 'present':
             if update_password in ('always', 'on_create'):
                 if not password:
                     msg = "update_password is %s but a password value is missing" % update_password
-                    module.fail_json(msg=msg)
+                    self.fail_json(msg=msg)
             default_project_id = None
             if default_project:
-                default_project_id = _get_default_project_id(cloud, default_project, domain_id, module)
+                default_project_id = self._get_default_project_id(
+                    default_project, domain_id)
 
             if user is None:
                 if description is not None:
-                    user = cloud.create_user(
+                    user = self.conn.create_user(
                         name=name, password=password, email=email,
                         default_project=default_project_id, domain_id=domain_id,
                         enabled=enabled, description=description)
                 else:
-                    user = cloud.create_user(
+                    user = self.conn.create_user(
                         name=name, password=password, email=email,
                         default_project=default_project_id, domain_id=domain_id,
                         enabled=enabled)
@@ -246,47 +238,49 @@ def main():
                 if default_project_id is not None:
                     params_dict['default_project_id'] = default_project_id
 
-                if _needs_update(params_dict, user):
+                if self._needs_update(params_dict, user):
                     if update_password == 'always':
                         if description is not None:
-                            user = cloud.update_user(
+                            user = self.conn.update_user(
                                 user['id'], password=password, email=email,
                                 default_project=default_project_id,
                                 domain_id=domain_id, enabled=enabled, description=description)
                         else:
-                            user = cloud.update_user(
+                            user = self.conn.update_user(
                                 user['id'], password=password, email=email,
                                 default_project=default_project_id,
                                 domain_id=domain_id, enabled=enabled)
                     else:
                         if description is not None:
-                            user = cloud.update_user(
+                            user = self.conn.update_user(
                                 user['id'], email=email,
                                 default_project=default_project_id,
                                 domain_id=domain_id, enabled=enabled, description=description)
                         else:
-                            user = cloud.update_user(
+                            user = self.conn.update_user(
                                 user['id'], email=email,
                                 default_project=default_project_id,
                                 domain_id=domain_id, enabled=enabled)
                     changed = True
                 else:
                     changed = False
-            module.exit_json(changed=changed, user=user)
+            self.exit_json(changed=changed, user=user)
 
         elif state == 'absent':
             if user is None:
                 changed = False
             else:
                 if domain:
-                    cloud.delete_user(user['id'], domain_id=domain_id)
+                    self.conn.delete_user(user['id'], domain_id=domain_id)
                 else:
-                    cloud.delete_user(user['id'])
+                    self.conn.delete_user(user['id'])
                 changed = True
-            module.exit_json(changed=changed)
+            self.exit_json(changed=changed)
 
-    except sdk.exceptions.OpenStackCloudException as e:
+
-        module.fail_json(msg=str(e), extra_data=e.extra_data)
+def main():
+    module = IdentityUserModule()
+    module()
 
 
 if __name__ == '__main__':

plugins/modules/identity_user_info.py

@@ -6,7 +6,7 @@ DOCUMENTATION = '''
 ---
 module: identity_user_info
 short_description: Retrieve information about one or more OpenStack users
-author: "Ricardo Carrillo Cruz (@rcarrillocruz)"
+author: OpenStack Ansible SIG
 description:
     - Retrieve information about a one or more OpenStack users
     - This module was called C(openstack.cloud.identity_user_facts) before Ansible 2.9, returning C(ansible_facts).
@@ -107,61 +107,47 @@ openstack_users:
             type: str
 '''
 
-from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (
-    openstack_full_argument_spec,
-    openstack_cloud_from_module,
-)
 
 
-def main():
+class IdentityUserInfoModule(OpenStackModule):
-
+    argument_spec = dict(
-    argument_spec = openstack_full_argument_spec(
         name=dict(required=False, default=None),
         domain=dict(required=False, default=None),
         filters=dict(required=False, type='dict', default=None),
     )
+    module_kwargs = dict(
+        supports_check_mode=True
+    )
 
-    module = AnsibleModule(argument_spec)
+    deprecated_names = ('openstack.cloud.identity_user_facts')
-    is_old_facts = module._name == 'openstack.cloud.identity_user_facts'
-    if is_old_facts:
-        module.deprecate("The 'openstack.cloud.identity_user_facts' module has been renamed to 'openstack.cloud.identity_user_info', "
-                         "and the renamed one no longer returns ansible_facts", version='2.13')
 
-    sdk, opcloud = openstack_cloud_from_module(module)
+    def run(self):
-    try:
+        name = self.params['name']
-        name = module.params['name']
+        domain = self.params['domain']
-        domain = module.params['domain']
+        filters = self.params['filters']
-        filters = module.params['filters']
 
         if domain:
             try:
                 # We assume admin is passing domain id
-                dom = opcloud.get_domain(domain)['id']
+                dom = self.conn.get_domain(domain)['id']
                 domain = dom
             except Exception:
                 # If we fail, maybe admin is passing a domain name.
                 # Note that domains have unique names, just like id.
-                dom = opcloud.search_domains(filters={'name': domain})
+                dom = self.conn.search_domains(filters={'name': domain})
                 if dom:
                     domain = dom[0]['id']
                 else:
-                    module.fail_json(msg='Domain name or ID does not exist')
+                    self.fail_json(msg='Domain name or ID does not exist')
 
-            if not filters:
+        users = self.conn.search_users(name, filters, domain_id=domain)
-                filters = {}
+        self.exit_json(changed=False, openstack_users=users)
 
-            filters['domain_id'] = domain
 
-        users = opcloud.search_users(name, filters)
+def main():
-        if is_old_facts:
+    module = IdentityUserInfoModule()
-            module.exit_json(changed=False, ansible_facts=dict(
+    module()
-                openstack_users=users))
-        else:
-            module.exit_json(changed=False, openstack_users=users)
-
-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e))
 
 
 if __name__ == '__main__':

plugins/modules/image.py

@@ -11,7 +11,7 @@ DOCUMENTATION = '''
 ---
 module: image
 short_description: Add/Delete images from OpenStack Cloud
-author: "Monty Taylor (@emonty)"
+author: OpenStack Ansible SIG
 description:
    - Add or Remove images from the OpenStack Image Repository
 options:
@@ -85,6 +85,12 @@ options:
      choices: [present, absent]
      default: present
      type: str
+   tags:
+     description:
+       - List of tags to be applied to the image
+     default: []
+     type: list
+     elements: str
    volume:
      description:
        - ID of a volume to create an image from.
@@ -115,6 +121,8 @@ EXAMPLES = '''
     filename: cirros-0.3.0-x86_64-disk.img
     kernel: cirros-vmlinuz
     ramdisk: cirros-initrd
+    tags:
+      - custom
     properties:
       cpu_arch: x86_64
       distro: ubuntu
@@ -147,95 +155,99 @@ EXAMPLES = '''
     name: myvol_image
 '''
 
-from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
 
 
-def main():
+class ImageModule(OpenStackModule):
 
-    argument_spec = openstack_full_argument_spec(
+    deprecated_names = ('os_image', 'openstack.cloud.os_image')
-        name=dict(required=True),
+
-        id=dict(default=None),
+    argument_spec = dict(
-        checksum=dict(default=None),
+        name=dict(required=True, type='str'),
-        disk_format=dict(default='qcow2', choices=['ami', 'ari', 'aki', 'vhd', 'vmdk', 'raw', 'qcow2', 'vdi', 'iso', 'vhdx', 'ploop']),
+        id=dict(type='str'),
+        checksum=dict(type='str'),
+        disk_format=dict(default='qcow2',
+                         choices=['ami', 'ari', 'aki', 'vhd', 'vmdk', 'raw', 'qcow2', 'vdi', 'iso', 'vhdx', 'ploop']),
         container_format=dict(default='bare', choices=['ami', 'aki', 'ari', 'bare', 'ovf', 'ova', 'docker']),
-        owner=dict(default=None),
+        owner=dict(type='str'),
         min_disk=dict(type='int', default=0),
         min_ram=dict(type='int', default=0),
         is_public=dict(type='bool', default=False),
         protected=dict(type='bool', default=False),
-        filename=dict(default=None),
+        filename=dict(type='str'),
-        ramdisk=dict(default=None),
+        ramdisk=dict(type='str'),
-        kernel=dict(default=None),
+        kernel=dict(type='str'),
         properties=dict(type='dict', default={}),
-        volume=dict(default=None),
+        volume=dict(type='str'),
+        tags=dict(type='list', default=[], elements='str'),
         state=dict(default='present', choices=['absent', 'present']),
     )
 
-    module_kwargs = openstack_module_kwargs(
+    module_kwargs = dict(
         mutually_exclusive=[['filename', 'volume']],
     )
-    module = AnsibleModule(argument_spec, **module_kwargs)
 
-    sdk, cloud = openstack_cloud_from_module(module)
+    def run(self):
-    try:
 
         changed = False
-        if module.params['id']:
+        if self.params['id']:
-            image = cloud.get_image(name_or_id=module.params['id'])
+            image = self.conn.get_image(name_or_id=self.params['id'])
-        elif module.params['checksum']:
+        elif self.params['checksum']:
-            image = cloud.get_image(name_or_id=module.params['name'], filters={'checksum': module.params['checksum']})
+            image = self.conn.get_image(name_or_id=self.params['name'], filters={'checksum': self.params['checksum']})
         else:
-            image = cloud.get_image(name_or_id=module.params['name'])
+            image = self.conn.get_image(name_or_id=self.params['name'])
 
-        if module.params['state'] == 'present':
+        if self.params['state'] == 'present':
             if not image:
                 kwargs = {}
-                if module.params['id'] is not None:
+                if self.params['id'] is not None:
-                    kwargs['id'] = module.params['id']
+                    kwargs['id'] = self.params['id']
-                image = cloud.create_image(
+                image = self.conn.create_image(
-                    name=module.params['name'],
+                    name=self.params['name'],
-                    filename=module.params['filename'],
+                    filename=self.params['filename'],
-                    disk_format=module.params['disk_format'],
+                    disk_format=self.params['disk_format'],
-                    container_format=module.params['container_format'],
+                    container_format=self.params['container_format'],
-                    wait=module.params['wait'],
+                    wait=self.params['wait'],
-                    timeout=module.params['timeout'],
+                    timeout=self.params['timeout'],
-                    is_public=module.params['is_public'],
+                    is_public=self.params['is_public'],
-                    protected=module.params['protected'],
+                    protected=self.params['protected'],
-                    min_disk=module.params['min_disk'],
+                    min_disk=self.params['min_disk'],
-                    min_ram=module.params['min_ram'],
+                    min_ram=self.params['min_ram'],
-                    volume=module.params['volume'],
+                    volume=self.params['volume'],
+                    tags=self.params['tags'],
                     **kwargs
                 )
                 changed = True
-                if not module.params['wait']:
+                if not self.params['wait']:
-                    module.exit_json(changed=changed, image=image, id=image.id)
+                    self.exit(changed=changed, image=image, id=image.id)
 
-            cloud.update_image_properties(
+            self.conn.update_image_properties(
                 image=image,
-                kernel=module.params['kernel'],
+                kernel=self.params['kernel'],
-                ramdisk=module.params['ramdisk'],
+                ramdisk=self.params['ramdisk'],
-                protected=module.params['protected'],
+                protected=self.params['protected'],
-                **module.params['properties'])
+                **self.params['properties'])
-            image = cloud.get_image(name_or_id=image.id)
+            if self.params['tags']:
-            module.exit_json(changed=changed, image=image, id=image.id)
+                self.conn.image.update_image(image.id, tags=self.params['tags'])
+            image = self.conn.get_image(name_or_id=image.id)
+            self.exit(changed=changed, image=image, id=image.id)
 
-        elif module.params['state'] == 'absent':
+        elif self.params['state'] == 'absent':
             if not image:
                 changed = False
             else:
-                cloud.delete_image(
+                self.conn.delete_image(
-                    name_or_id=module.params['name'],
+                    name_or_id=self.params['name'],
-                    wait=module.params['wait'],
+                    wait=self.params['wait'],
-                    timeout=module.params['timeout'])
+                    timeout=self.params['timeout'])
                 changed = True
-            module.exit_json(changed=changed)
+            self.exit(changed=changed)
-
-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e), extra_data=e.extra_data)
 
 
-if __name__ == "__main__":
+def main():
+    module = ImageModule()
+    module()
+
+
+if __name__ == '__main__':
     main()