Merge "Release 1.5.3 version with bugfixes"

Change-Id: I90f72c7ea5869331633ad655275722fdb69570aa

.zuul.yaml

@@ -11,6 +11,7 @@
       - openstack/designate
     irrelevant-files: &ignore_files
       - changelogs/.*
+      - galaxy.*
       - COPYING
       - docs/.*
       - .*\.md
@@ -40,7 +41,7 @@
     required-projects:
       - openstack/octavia
       - name: github.com/ansible/ansible
-        override-checkout: stable-2.11
+        override-checkout: stable-2.12
     files:
       - ^ci/roles/loadbalancer/.*$
       - ^plugins/modules/lb_health_monitor.py
@@ -94,13 +95,25 @@
     parent: ansible-collections-openstack-functional-devstack
     description: |
       Run openstack collections functional tests against a master devstack
-      using master of openstacksdk and stable 2.11 branch of ansible
+      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-devel
     parent: ansible-collections-openstack-functional-devstack
@@ -112,36 +125,36 @@
       - name: github.com/ansible/ansible
         override-checkout: devel
     vars:
-      tox_envlist: ansible-2.11
+      tox_envlist: ansible-2.12
 
 # Stable branches tests
 - job:
-    name: ansible-collections-openstack-functional-devstack-wallaby-ansible-2.11
+    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.11 branch of ansible
+      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.11
+        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.11
+    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.11 branch of ansible
+      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.11
+        override-checkout: stable-2.12
       - name: openstack/openstacksdk
         override-checkout: stable/victoria
     vars:
@@ -172,6 +185,7 @@
     description: |
       Run openstack collections functional tests against a train devstack
       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
@@ -200,63 +214,6 @@
     vars:
       tox_envlist: ansible
 
-- job:
-    name: ansible-collections-openstack-functional-devstack-queens-ansible-devel
-    parent: ansible-collections-openstack-functional-devstack-ansible-devel
-    description: |
-      Run openstack collections functional tests against a queens devstack
-      using master branch of openstacksdk and devel branch of ansible
-    voting: false
-    override-checkout: stable/queens
-    required-projects:
-      - name: github.com/ansible/ansible
-        override-checkout: devel
-      - name: openstack/openstacksdk
-        # Run queens with highest possible py2 version of SDK
-        override-checkout: stable/train
-    vars:
-      tox_envlist: ansible-2.11
-
-# Experimental pipeline jobs
-- job:
-    name: ansible-collections-openstack-functional-devstack-stein-ansible-2.11
-    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.11 branch of ansible
-    voting: true
-    override-checkout: stable/stein
-    required-projects:
-      - name: github.com/ansible/ansible
-        override-checkout: stable-2.11
-      - name: openstack/openstacksdk
-        override-checkout: stable/stein
-      - name: openstack/os-client-config
-        override-checkout: stable/stein
-    vars:
-      tox_envlist: ansible
-
-- job:
-    name: ansible-collections-openstack-functional-devstack-rocky-ansible-2.11
-    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.11 branch of ansible
-    voting: true
-    override-checkout: stable/rocky
-    required-projects:
-      - name: github.com/ansible/ansible
-        override-checkout: stable-2.11
-      - name: openstack/openstacksdk
-        override-checkout: stable/rocky
-      - name: openstack/os-client-config
-        override-checkout: stable/rocky
-      - name: openstack/shade
-        override-checkout: stable/rocky
-
-    vars:
-      tox_envlist: ansible
-
 # Linters
 - job:
     name: openstack-tox-linters-ansible-devel
@@ -270,22 +227,22 @@
       - name: github.com/ansible/ansible
         override-checkout: devel
     vars:
-      tox_envlist: linters-2.11
+      tox_envlist: linters-2.12
       python_version: 3.8
       bindep_profile: test py38
 
 - job:
-    name: openstack-tox-linters-ansible-2.11
+    name: openstack-tox-linters-ansible-2.12
     parent: openstack-tox-linters
     nodeset: ubuntu-focal
     description: |
-      Run openstack collections linter tests using the 2.11 branch of ansible
+      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.11
+        override-checkout: stable-2.12
     vars:
-      tox_envlist: linters-2.11
+      tox_envlist: linters-2.12
       python_version: 3.8
       bindep_profile: test py38
 
@@ -372,27 +329,25 @@
       jobs:
         - tox-pep8
         - openstack-tox-linters-ansible-devel
-        - openstack-tox-linters-ansible-2.11
+        - 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
-              - openstack-tox-linters-ansible-2.11
+              - openstack-tox-linters-ansible-2.12
 
         - ansible-collections-openstack-functional-devstack-releases:
             dependencies: *deps_unit_lint
         - ansible-collections-openstack-functional-devstack-ansible-2.9:
             dependencies: *deps_unit_lint
-        - ansible-collections-openstack-functional-devstack-ansible-2.11:
+        - ansible-collections-openstack-functional-devstack-ansible-2.12:
             dependencies: *deps_unit_lint
         - ansible-collections-openstack-functional-devstack-ansible-devel:
             dependencies: *deps_unit_lint
-        - ansible-collections-openstack-functional-devstack-wallaby-ansible-2.11:
+        - ansible-collections-openstack-functional-devstack-wallaby-ansible-2.12:
             dependencies: *deps_unit_lint
-        - ansible-collections-openstack-functional-devstack-victoria-ansible-2.11:
-            dependencies: *deps_unit_lint
-        - ansible-collections-openstack-functional-devstack-ussuri-ansible-2.11:
+        - ansible-collections-openstack-functional-devstack-victoria-ansible-2.12:
             dependencies: *deps_unit_lint
         - ansible-collections-openstack-functional-devstack-train-ansible-2.11:
             dependencies: *deps_unit_lint
@@ -421,15 +376,14 @@
     gate:
       jobs:
         - tox-pep8
-        - openstack-tox-linters-ansible-2.11
+        - 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.11
-        - ansible-collections-openstack-functional-devstack-wallaby-ansible-2.11
-        - ansible-collections-openstack-functional-devstack-victoria-ansible-2.11
-        - ansible-collections-openstack-functional-devstack-ussuri-ansible-2.11
+        - ansible-collections-openstack-functional-devstack-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
         - ansible-collections-openstack-functional-devstack-octavia
@@ -438,28 +392,25 @@
     periodic:
       jobs:
         - openstack-tox-linters-ansible-devel
-        - openstack-tox-linters-ansible-2.11
+        - 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.11
+        - ansible-collections-openstack-functional-devstack-ansible-2.12
         - ansible-collections-openstack-functional-devstack-ansible-devel
-        - ansible-collections-openstack-functional-devstack-wallaby-ansible-2.11
-        - ansible-collections-openstack-functional-devstack-victoria-ansible-2.11
-        - ansible-collections-openstack-functional-devstack-ussuri-ansible-2.11
+        - 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
-        - ansible-collections-openstack-functional-devstack-queens-ansible-devel
         - bifrost-collections-src
         - bifrost-keystone-collections-src
         - ansible-collections-openstack-functional-devstack-octavia
 
     experimental:
       jobs:
-        - ansible-collections-openstack-functional-devstack-stein-ansible-2.11
-        - ansible-collections-openstack-functional-devstack-rocky-ansible-2.11
-        - ansible-collections-openstack-functional-devstack-queens-ansible-devel
+        - ansible-collections-openstack-functional-devstack-ansible-2.11
+        - ansible-collections-openstack-functional-devstack-ussuri-ansible-2.11
 
     tag:
       jobs:

CHANGELOG.rst

@@ -5,6 +5,43 @@ Openstack Cloud Ansilbe modules Release Notes
 .. contents:: Topics
 
 
+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
 ======
 

README.md

@@ -83,6 +83,14 @@ Or you can add the full namespace and collection name in the `collections` eleme
         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)

changelogs/changelog.yaml

@@ -246,3 +246,23 @@ releases:
       - 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'

galaxy.yml

@@ -33,4 +33,4 @@ build_ignore:
   - ansible_collections_openstack.egg-info
   - contrib
   - changelogs
-version: 1.5.1
+version: 1.5.3

plugins/inventory/openstack.py

@@ -311,7 +311,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 = []

plugins/module_utils/openstack.py

@@ -261,6 +261,7 @@ class OpenStackModule:
         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()
 

plugins/modules/compute_flavor.py

@@ -220,9 +220,12 @@ class ComputeFlavorModule(OpenStackModule):
                     if self.params[param_key] != flavor[param_key]:
                         require_update = True
                         break
-
+            flavorid = self.params['flavorid']
             if flavor and require_update:
                 self.conn.delete_flavor(name)
+                old_extra_specs = {}
+                if flavorid == 'auto':
+                    flavorid = flavor['id']
                 flavor = None
 
             if not flavor:
@@ -231,7 +234,7 @@ class ComputeFlavorModule(OpenStackModule):
                     ram=self.params['ram'],
                     vcpus=self.params['vcpus'],
                     disk=self.params['disk'],
-                    flavorid=self.params['flavorid'],
+                    flavorid=flavorid,
                     ephemeral=self.params['ephemeral'],
                     swap=self.params['swap'],
                     rxtx_factor=self.params['rxtx_factor'],

plugins/modules/lb_listener.py

@@ -38,6 +38,16 @@ options:
         - The protocol port number for the listener.
      default: 80
      type: int
+   timeout_client_data:
+     description:
+        - Client inactivity timeout in milliseconds.
+     default: 50000
+     type: int
+   timeout_member_data:
+     description:
+        - Member inactivity timeout in milliseconds.
+     default: 50000
+     type: int
    wait:
      description:
         - If the module should wait for the load balancer to be ACTIVE.
@@ -108,6 +118,14 @@ listener:
             description: The protocol port number for the listener.
             type: int
             sample: 80
+        timeout_client_data:
+            description: Client inactivity timeout in milliseconds.
+            type: int
+            sample: 50000
+        timeout_member_data:
+            description: Member inactivity timeout in milliseconds.
+            type: int
+            sample: 50000
 '''
 
 EXAMPLES = '''
@@ -139,6 +157,18 @@ EXAMPLES = '''
     state: absent
     name: test-listener
     loadbalancer: test-loadbalancer
+
+# Create a listener, increase timeouts for connection persistence (for SSH for example).
+- openstack.cloud.lb_listener:
+    cloud: mycloud
+    endpoint_type: admin
+    state: present
+    name: test-listener
+    loadbalancer: test-loadbalancer
+    protocol: TCP
+    protocol_port: 22
+    timeout_client_data: 1800000
+    timeout_member_data: 1800000
 '''
 
 import time
@@ -154,6 +184,8 @@ class LoadbalancerListenerModule(OpenStackModule):
         protocol=dict(default='HTTP',
                       choices=['HTTP', 'HTTPS', 'TCP', 'TERMINATED_HTTPS', 'UDP', 'SCTP']),
         protocol_port=dict(default=80, type='int', required=False),
+        timeout_client_data=dict(default=50000, type='int', required=False),
+        timeout_member_data=dict(default=50000, type='int', required=False),
     )
     module_kwargs = dict()
 
@@ -205,6 +237,8 @@ class LoadbalancerListenerModule(OpenStackModule):
                     loadbalancer_id=loadbalancer_id,
                     protocol=self.params['protocol'],
                     protocol_port=self.params['protocol_port'],
+                    timeout_client_data=self.params['timeout_client_data'],
+                    timeout_member_data=self.params['timeout_member_data'],
                 )
                 changed = True
 

plugins/modules/port.py

@@ -340,11 +340,11 @@ class NetworkPortModule(OpenStackModule):
 
         for key in compare_list_dict:
             if not self.params[key]:
-                if port[key]:
+                if port.get(key):
                     return True
 
             if self.params[key]:
-                if not port[key]:
+                if not port.get(key):
                     return True
 
                 # sort dicts in list

plugins/modules/server_volume.py

@@ -89,6 +89,9 @@ class ServerVolumeModule(OpenStackModule):
         server = self.conn.get_server(self.params['server'])
         volume = self.conn.get_volume(self.params['volume'])
 
+        if not server:
+            self.fail(msg='server %s is not found' % self.params['server'])
+
         if not volume:
             self.fail(msg='volume %s is not found' % self.params['volume'])
 

test-requirements-2.12.txt

@@ -0,0 +1,11 @@
+openstacksdk
+ansible-core
+pycodestyle
+flake8
+pylint
+voluptuous
+yamllint
+rstcheck
+ruamel.yaml
+#galaxy-importer  # see https://review.opendev.org/#/c/743054
+tox

tox.ini

@@ -65,6 +65,12 @@ commands = {[testenv:linters]commands}
 deps =
     -r{toxinidir}/test-requirements-2.11.txt
 
+[testenv:linters-2.12]
+passenv = {[testenv:linters]passenv}
+commands = {[testenv:linters]commands}
+deps =
+    -r{toxinidir}/test-requirements-2.12.txt
+
 [testenv:venv]
 deps =
     -r{toxinidir}/test-requirements.txt
@@ -112,6 +118,12 @@ deps =
 passenv = {[testenv:ansible]passenv}
 commands = {[testenv:ansible]commands}
 
+[testenv:ansible-2.12]
+deps =
+    -r{toxinidir}/test-requirements-2.12.txt
+passenv = {[testenv:ansible]passenv}
+commands = {[testenv:ansible]commands}
+
 [testenv:galaxy-release]
 deps =
     ansible-core