Release 1.7.2 version

Primary reason for this new release is to fix the mess we did yesterday
when we accidentially merged release 1.7.1 and all changes from the
stable branch into the master branch. This release 1.7.2 does not really
change anything except fixing the guidelines.

Change-Id: I1ad23bd36746a180f8851df294df4e01213bdf2f

.zuul.yaml

@@ -3,6 +3,7 @@
 - job:
     name: ansible-collections-openstack-functional-devstack
     parent: openstacksdk-functional-devstack
+    branches: ^(stable/1.0.0|master).*$
     post-run: ci/playbooks/postlog.yaml
     description: |
       Run openstack collections functional tests against a master devstack
@@ -39,6 +40,8 @@
 - job:
     name: ansible-collections-openstack-functional-devstack-octavia
     parent: ansible-collections-openstack-functional-devstack
+    branches: ^(stable/1.0.0|master).*$
+    override-checkout: master
     description: |
       Run openstack collections functional tests against a master devstack
       with Octavia plugin enabled, using releases of openstacksdk and latest
@@ -77,6 +80,7 @@
 - job:
     name: ansible-collections-openstack-functional-devstack-releases
     parent: ansible-collections-openstack-functional-devstack
+    override-checkout: master
     description: |
       Run openstack collections functional tests against a master devstack
       using releases of openstacksdk and latest ansible release
@@ -88,6 +92,7 @@
 - job:
     name: ansible-collections-openstack-functional-devstack-ansible-2.9
     parent: ansible-collections-openstack-functional-devstack
+    override-checkout: master
     description: |
       Run openstack collections functional tests against a master devstack
       using master of openstacksdk and stable 2.9 branch of ansible
@@ -100,6 +105,7 @@
 - job:
     name: ansible-collections-openstack-functional-devstack-ansible-2.11
     parent: ansible-collections-openstack-functional-devstack
+    override-checkout: master
     description: |
       Run openstack collections functional tests against a master devstack
       using master of openstacksdk and stable 2.12 branch of ansible
@@ -112,6 +118,7 @@
 - job:
     name: ansible-collections-openstack-functional-devstack-ansible-2.12
     parent: ansible-collections-openstack-functional-devstack
+    override-checkout: master
     description: |
       Run openstack collections functional tests against a master devstack
       using master of openstacksdk and stable 2.12 branch of ansible
@@ -121,16 +128,10 @@
     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
+    override-checkout: master
     description: |
       Run openstack collections functional tests against a master devstack
       using master of openstacksdk and devel branch of ansible
@@ -158,6 +159,7 @@
         override-checkout: stable/xena
     vars:
       tox_envlist: ansible
+      tox_install_siblings: true
 
 - job:
     name: ansible-collections-openstack-functional-devstack-wallaby-ansible-2.12
@@ -174,6 +176,7 @@
         override-checkout: stable/wallaby
     vars:
       tox_envlist: ansible
+      tox_install_siblings: true
 
 - job:
     name: ansible-collections-openstack-functional-devstack-victoria-ansible-2.12
@@ -190,6 +193,7 @@
         override-checkout: stable/victoria
     vars:
       tox_envlist: ansible
+      tox_install_siblings: true
 
 
 - job:
@@ -209,6 +213,7 @@
         override-checkout: stable/ussuri
     vars:
       tox_envlist: ansible
+      tox_install_siblings: true
 
 - job:
     name: ansible-collections-openstack-functional-devstack-train-ansible-2.11
@@ -227,6 +232,7 @@
         override-checkout: stable/train
     vars:
       tox_envlist: ansible
+      tox_install_siblings: true
 
 - job:
     name: ansible-collections-openstack-functional-devstack-queens-ansible-2.11
@@ -244,6 +250,7 @@
         override-checkout: stable/train
     vars:
       tox_envlist: ansible
+      tox_install_siblings: true
 
 # Linters
 - job:
@@ -343,11 +350,13 @@
     name: tripleo-ci-centos-9-standalone-osa
     parent: tripleo-ci-centos-8-standalone-osa
     nodeset: single-centos-9-node
-    branches: master
+    branches: ^(stable/1.0.0|master).*$
+    override-checkout: master
     vars:
       containers_base_image: quay.io/centos/centos:stream9
       consumer_job: false
       build_container_images: true
+      branch_override: master
     files: *ooo_files
     irrelevant-files: *irr_files
 
@@ -368,7 +377,7 @@
 - job:
     name: tripleo-ci-centos-9-standalone-wallaby-osa
     parent: tripleo-ci-centos-9-standalone-osa
-    branches: master
+    branches: ^(stable/1.0.0|master).*$
     override-checkout: stable/wallaby
     vars:
       branch_override: stable/wallaby
@@ -409,8 +418,6 @@
               - openstack-tox-linters-ansible-2.9
               - openstack-tox-linters-ansible-2.12
 
-        - ansible-collections-openstack-functional-devstack-ansible-new_sdk:
-            dependencies: *deps_unit_lint
         - ansible-collections-openstack-functional-devstack-releases:
             dependencies: *deps_unit_lint
         - ansible-collections-openstack-functional-devstack-ansible-2.9:
@@ -425,6 +432,7 @@
             dependencies: *deps_unit_lint
         - ansible-collections-openstack-functional-devstack-train-ansible-2.11:
             dependencies: *deps_unit_lint
+            voting: false
         - ansible-collections-openstack-functional-devstack-octavia:
             dependencies: *deps_unit_lint
 
@@ -463,7 +471,7 @@
         - ansible-collections-openstack-functional-devstack-ansible-2.12
         - ansible-collections-openstack-functional-devstack-wallaby-ansible-2.12
         - ansible-collections-openstack-functional-devstack-xena-ansible-2.12
-        - ansible-collections-openstack-functional-devstack-train-ansible-2.11
+        # - ansible-collections-openstack-functional-devstack-train-ansible-2.11
         - ansible-collections-openstack-functional-devstack-octavia
         - tripleo-ci-centos-8-standalone-wallaby-osa
 

CHANGELOG.rst

@@ -5,6 +5,38 @@ Openstack Cloud Ansilbe modules Release Notes
 .. contents:: Topics
 
 
+v1.7.2
+======
+
+Release Summary
+---------------
+
+Bugfixes
+
+Bugfixes
+--------
+
+- Fix collection guidelines
+
+v1.7.1
+======
+
+Release Summary
+---------------
+
+Bugfixes
+
+Minor Changes
+-------------
+
+- lb_member - Add monitor_[address,port] parameter
+
+Bugfixes
+--------
+
+- openstack_inventory - Fix documentation
+- quota - Fix description of volumes_types parameter
+
 v1.7.0
 ======
 

changelogs/changelog.yaml

@@ -304,3 +304,18 @@ releases:
       name: baremetal_port_info
       namespace: ''
     release_date: '2022-02-15'
+  1.7.1:
+    changes:
+      bugfixes:
+      - openstack_inventory - Fix documentation
+      - quota - Fix description of volumes_types parameter
+      minor_changes:
+      - lb_member - Add monitor_[address,port] parameter
+      release_summary: Bugfixes
+    release_date: '2022-03-08'
+  1.7.2:
+    changes:
+      bugfixes:
+      - Fix collection guidelines
+      release_summary: Bugfixes
+    release_date: '2022-03-10'

docs/openstack_guidelines.rst

@@ -13,7 +13,7 @@ Naming
 ------
 
 * This is a collection named ``openstack.cloud``. There is no need for further namespace prefixing.
-* Name any module that a cloud consumer would expect to use after the logical resource it manages: 
+* Name any module that a cloud consumer would expect to use after the logical resource it manages:
   ``server`` not ``nova``. This naming convention acknowledges that the end user does not care
   which service manages the resource - that is a deployment detail. For example cloud consumers may
   not know whether their floating IPs are managed by Nova or Neutron.
@@ -24,6 +24,7 @@ Interface
 * If the resource being managed has an id, it should be returned.
 * If the resource being managed has an associated object more complex than
   an id, it should also be returned.
+* Return format shall be a dictionary or list
 
 Interoperability
 ----------------
@@ -53,7 +54,7 @@ Libraries
 * All complex cloud interaction or interoperability code should be housed in
   the `openstacksdk <https://opendev.org/openstack/openstacksdk>`_
   library.
-* All OpenStack API interactions should happen via the openstacksdk and not via
+* All OpenStack API interactions should happen via the openstackSDK and not via
   OpenStack Client libraries. The OpenStack Client libraries do no have end
   users as a primary audience, they are for intra-server communication.
 * All modules should be registered in ``meta/action_groups.yml`` for enabling the

galaxy.yml

@@ -33,4 +33,4 @@ build_ignore:
   - ansible_collections_openstack.egg-info
   - contrib
   - changelogs
-version: 1.7.0
+version: 1.7.2

plugins/inventory/openstack.py

@@ -9,7 +9,6 @@
 DOCUMENTATION = '''
 ---
 name: openstack
-plugin_type: inventory
 author: OpenStack Ansible SIG
 short_description: OpenStack inventory source
 requirements:

plugins/modules/lb_member.py

@@ -51,6 +51,14 @@ options:
           into ACTIVE state.
      default: 180
      type: int
+   monitor_address:
+     description:
+        - IP address used to monitor this member
+     type: str
+   monitor_port:
+     description:
+        - Port used to monitor this member
+     type: int
 requirements:
     - "python >= 3.6"
     - "openstacksdk"
@@ -141,6 +149,8 @@ class LoadbalancerMemberModule(OpenStackModule):
         address=dict(default=None),
         protocol_port=dict(default=80, type='int'),
         subnet_id=dict(default=None),
+        monitor_address=dict(default=None),
+        monitor_port=dict(default=None, type='int')
     )
     module_kwargs = dict()
 
@@ -191,7 +201,9 @@ class LoadbalancerMemberModule(OpenStackModule):
                     address=self.params['address'],
                     name=name,
                     protocol_port=self.params['protocol_port'],
-                    subnet_id=self.params['subnet_id']
+                    subnet_id=self.params['subnet_id'],
+                    monitor_address=self.params['monitor_address'],
+                    monitor_port=self.params['monitor_port']
                 )
                 changed = True
 

plugins/modules/quota.py

@@ -128,7 +128,7 @@ options:
     volumes_types:
         description:
             - Per-driver volume count quotas.  Keys should be
-              prefixed with C(gigabytes_) values should be ints.
+              prefixed with C(volumes_) values should be ints.
         type: dict
     project:
         description: Unused, kept for compatability