From 79d7827d170d5980da3f779df91099c3a18d45f0 Mon Sep 17 00:00:00 2001 From: Sagi Shnaidman Date: Wed, 16 Feb 2022 14:34:44 +0200 Subject: [PATCH 1/5] Run jobs on stable branch Disable temporarly train job since it fails. Change-Id: I012b03fd8c9158a2280691f00304e5f013f045f6 --- .zuul.yaml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index f0c2cd16..e8d83155 100644 --- a/.zuul.yaml +++ b/.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 @@ -124,6 +131,7 @@ - job: name: ansible-collections-openstack-functional-devstack-ansible-new_sdk parent: ansible-collections-openstack-functional-devstack-ansible-2.12 + override-checkout: master voting: false vars: tox_install_siblings: true @@ -131,6 +139,7 @@ - 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 +167,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 +184,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 +201,7 @@ override-checkout: stable/victoria vars: tox_envlist: ansible + tox_install_siblings: true - job: @@ -209,6 +221,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 +240,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 +258,7 @@ override-checkout: stable/train vars: tox_envlist: ansible + tox_install_siblings: true # Linters - job: @@ -343,11 +358,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 +385,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 @@ -425,6 +442,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 +481,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 From 9f58d54721b2ef4a7ab42b58de4ba25aadf9075e Mon Sep 17 00:00:00 2001 From: Sagi Shnaidman Date: Tue, 8 Mar 2022 13:40:21 +0200 Subject: [PATCH 2/5] Fix inventory plugin doc for new ansible Change-Id: I8bd8767d2ac0117e03c9b23882494d45847b15cf Signed-off-by: Sagi Shnaidman (cherry picked from commit 3c7a8f39a2509246393f9b015b2e743aa087aa3b) --- plugins/inventory/openstack.py | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/inventory/openstack.py b/plugins/inventory/openstack.py index 3a1fabf6..9dbe478d 100644 --- a/plugins/inventory/openstack.py +++ b/plugins/inventory/openstack.py @@ -9,7 +9,6 @@ DOCUMENTATION = ''' --- name: openstack -plugin_type: inventory author: OpenStack Ansible SIG short_description: OpenStack inventory source requirements: From 0e102b1411bc790810ed89f5bc67e607f1dce0c6 Mon Sep 17 00:00:00 2001 From: Jan Weiher Date: Mon, 7 Mar 2022 13:31:29 +0100 Subject: [PATCH 3/5] [LB] Add support for setting monitor_address Change-Id: I4897c6343813519859bd19fa162829fe2a6dc573 (cherry picked from commit 37a51ec6ad0e2e0dd681558055d4a4ea786dd03c) --- plugins/modules/lb_member.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/plugins/modules/lb_member.py b/plugins/modules/lb_member.py index a1b15ad3..264f2b8e 100644 --- a/plugins/modules/lb_member.py +++ b/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 From ce73c9db34ee73e3d19dac8d76c46f9820c46fc0 Mon Sep 17 00:00:00 2001 From: Sagi Shnaidman Date: Wed, 9 Mar 2022 18:54:28 +0200 Subject: [PATCH 4/5] Remove new SDK job from stable/1.0.0 CI Change-Id: I04b45ec3dea19f3223929237cdbae702886a9982 --- .zuul.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index e8d83155..119ab2a7 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -128,14 +128,6 @@ vars: tox_envlist: ansible -- job: - name: ansible-collections-openstack-functional-devstack-ansible-new_sdk - parent: ansible-collections-openstack-functional-devstack-ansible-2.12 - override-checkout: master - voting: false - vars: - tox_install_siblings: true - - job: name: ansible-collections-openstack-functional-devstack-ansible-devel parent: ansible-collections-openstack-functional-devstack @@ -426,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: From b640e6207c6d0e8484f28dc8058019e7307fe805 Mon Sep 17 00:00:00 2001 From: Jakob Meng Date: Wed, 9 Mar 2022 20:17:52 +0100 Subject: [PATCH 5/5] Release 1.7.1 version Change-Id: I958ba6890a54c59e0ccdb9249d959c745acfb8e9 --- CHANGELOG.rst | 19 +++++++++++++++++++ changelogs/changelog.yaml | 9 +++++++++ galaxy.yml | 2 +- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0f253fb3..966eb074 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,25 @@ Openstack Cloud Ansilbe modules Release Notes .. contents:: Topics +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 ====== diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index efde8cdf..cca4c8c2 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -304,3 +304,12 @@ 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' diff --git a/galaxy.yml b/galaxy.yml index 67f638e1..fde97146 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -33,4 +33,4 @@ build_ignore: - ansible_collections_openstack.egg-info - contrib - changelogs -version: 1.7.0 +version: 1.7.1