From a0d77af51ca2440c419311faf0f1fd0cc7df4ca5 Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Thu, 22 Feb 2024 15:55:49 +0100 Subject: [PATCH 1/2] Add enable-chassis-as-gw option for OVN CMS cluster After recent neutron change [1] we need to add option enable-chassis-as-gw so that the chassis acts as gateway. I am also implementing workaround for known issue on mariadb [2]. [1] https://review.opendev.org/c/openstack/neutron/+/908325 [2] https://issues.redhat.com/browse/RDO-241 Change-Id: Ie6a9a9287f64256999c05f7a3ab273c436f1cf54 (cherry picked from commit 08a27a2ef52501223ea2898225ce625eb737bf04) (cherry picked from commit 0320e05a40ef0e0c60061f0b80cc616c9fda781d) --- .gitreview | 1 + .zuul.yaml | 8 +- Puppetfile | 80 +++++++++---------- .../packstack/manifests/neutron/ovn_agent.pp | 1 + playbooks/packstack-centos9-pre.yaml | 7 ++ run_tests.sh | 4 +- 6 files changed, 55 insertions(+), 46 deletions(-) diff --git a/.gitreview b/.gitreview index 463987619..183285e91 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=review.opendev.org port=29418 project=x/packstack.git +defaultbranch=stable/2023.1 diff --git a/.zuul.yaml b/.zuul.yaml index cba120220..6268a941f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -37,8 +37,8 @@ parent: packstack-base vars: selinux_enforcing: "false" - delorean: "https://trunk.rdoproject.org/centos9-master/puppet-passed-ci/delorean.repo" - delorean_deps: "https://trunk.rdoproject.org/centos9-master/delorean-deps.repo" + delorean: "https://trunk.rdoproject.org/centos9-antelope/puppet-passed-ci/delorean.repo" + delorean_deps: "https://trunk.rdoproject.org/centos9-antelope/delorean-deps.repo" pre-run: playbooks/packstack-centos9-pre.yaml nodeset: nodes: @@ -51,8 +51,8 @@ parent: packstack-base vars: selinux_enforcing: "false" - delorean: "https://trunk.rdoproject.org/centos9-master/puppet-passed-ci/delorean.repo" - delorean_deps: "https://trunk.rdoproject.org/centos9-master/delorean-deps.repo" + delorean: "https://trunk.rdoproject.org/centos9-antelope/puppet-passed-ci/delorean.repo" + delorean_deps: "https://trunk.rdoproject.org/centos9-antelope/delorean-deps.repo" pre-run: playbooks/packstack-centos9-pre.yaml post-run: playbooks/packstack-post-compute.yaml nodeset: diff --git a/Puppetfile b/Puppetfile index 235101ad8..335d7de19 100755 --- a/Puppetfile +++ b/Puppetfile @@ -4,163 +4,163 @@ moduledir '/usr/share/openstack-puppet/modules' mod 'aodh', :git => 'https://github.com/openstack/puppet-aodh', - :ref => 'master' + :ref => 'stable/2023.1' mod 'ceilometer', :git => 'https://github.com/openstack/puppet-ceilometer', - :ref => 'master' + :ref => 'stable/2023.1' mod 'cinder', :git => 'https://github.com/openstack/puppet-cinder', - :ref => 'master' + :ref => 'stable/2023.1' mod 'glance', :git => 'https://github.com/openstack/puppet-glance', - :ref => 'master' + :ref => 'stable/2023.1' mod 'gnocchi', :git => 'https://github.com/openstack/puppet-gnocchi', - :ref => 'master' + :ref => 'stable/2023.1' mod 'heat', :git => 'https://github.com/openstack/puppet-heat', - :ref => 'master' + :ref => 'stable/2023.1' mod 'magnum', :git => 'https://github.com/openstack/puppet-magnum', - :ref => 'master' + :ref => 'stable/2023.1' mod 'horizon', :git => 'https://github.com/openstack/puppet-horizon', - :ref => 'master' + :ref => 'stable/2023.1' mod 'ironic', :git => 'https://github.com/openstack/puppet-ironic', - :ref => 'master' + :ref => 'stable/2023.1' mod 'keystone', :git => 'https://github.com/openstack/puppet-keystone', - :ref => 'master' + :ref => 'stable/2023.1' mod 'manila', :git => 'https://github.com/openstack/puppet-manila', - :ref => 'master' + :ref => 'stable/2023.1' mod 'neutron', :git => 'https://github.com/openstack/puppet-neutron', - :ref => 'master' + :ref => 'stable/2023.1' mod 'nova', :git => 'https://github.com/openstack/puppet-nova', - :ref => 'master' + :ref => 'stable/2023.1' mod 'openstack_extras', :git => 'https://github.com/openstack/puppet-openstack_extras', - :ref => 'master' + :ref => 'stable/2023.1' mod 'openstacklib', :git => 'https://github.com/openstack/puppet-openstacklib', - :ref => 'master' + :ref => 'stable/2023.1' mod 'oslo', :git => 'https://github.com/openstack/puppet-oslo', - :ref => 'master' + :ref => 'stable/2023.1' mod 'ovn', :git => 'https://github.com/openstack/puppet-ovn', - :ref => 'master' + :ref => 'stable/2023.1' mod 'placement', :git => 'https://github.com/openstack/puppet-placement', - :ref => 'master' + :ref => 'stable/2023.1' mod 'sahara', :git => 'https://github.com/openstack/puppet-sahara', - :ref => 'master' + :ref => 'stable/2023.1' mod 'swift', :git => 'https://github.com/openstack/puppet-swift', - :ref => 'master' + :ref => 'stable/2023.1' mod 'tempest', :git => 'https://github.com/openstack/puppet-tempest', - :ref => 'master' + :ref => 'stable/2023.1' mod 'trove', :git => 'https://github.com/openstack/puppet-trove', - :ref => 'master' + :ref => 'stable/2023.1' mod 'vswitch', :git => 'https://github.com/openstack/puppet-vswitch', - :ref => 'master' + :ref => 'stable/2023.1' ## Non-OpenStack modules mod 'apache', :git => 'https://github.com/puppetlabs/puppetlabs-apache', - :ref => 'main' + :ref => '40d23ac2f16c94c5ed671bdc67be55de77ed1d8a' mod 'concat', :git => 'https://github.com/puppetlabs/puppetlabs-concat', - :ref => 'main' + :ref => 'v7.3.3' mod 'firewall', :git => 'https://github.com/puppetlabs/puppetlabs-firewall', - :ref => 'main' + :ref => 'a1e4768ee0c632ed67706fe7e0db1980e008e353' mod 'inifile', :git => 'https://github.com/puppetlabs/puppetlabs-inifile', - :ref => 'main' + :ref => '12e8ac0881c06e1d897a70f1544f89332bce2daa' mod 'memcached', :git => 'https://github.com/saz/puppet-memcached', - :ref => 'master' + :ref => 'bf92113a87ef6a595a0e1d9086ec6e25d0726f13' mod 'mysql', :git => 'https://github.com/puppetlabs/puppetlabs-mysql', - :ref => 'main' + :ref => 'f226c7f0788745f0e4b9eeb0058d06e11cdc9ffc' mod 'nssdb', :git => 'https://github.com/rcritten/puppet-nssdb', - :ref => 'master' + :ref => '2ed2a2df59bbeaf9cf628e1a4a499476842282fd' mod 'rabbitmq', :git => 'https://github.com/voxpupuli/puppet-rabbitmq', - :ref => 'master' + :ref => '1a1c6e724dc94761da8450943c1196571ccb79ee' mod 'redis', :git => 'https://github.com/arioch/puppet-redis', - :ref => 'master' + :ref => '9881323f519626863562c84b509c06591ba58b79' mod 'remote', :git => 'https://github.com/paramite/puppet-remote', - :ref => 'master' + :ref => '7420908328b832f4b20e1eba44bcccd926da8faa' mod 'rsync', :git => 'https://github.com/puppetlabs/puppetlabs-rsync', - :ref => 'main' + :ref => '65ee03436d46572ce046f2051fec2965a7ef6430' mod 'ssh', :git => 'https://github.com/saz/puppet-ssh', - :ref => 'master' + :ref => '8c871493260ff1a7027684c88b61a8b3e172d334' mod 'stdlib', :git => 'https://github.com/puppetlabs/puppetlabs-stdlib', - :ref => 'main' + :ref => 'ef733aabd13d3a74dcc472ac963e6a657049e3d3' mod 'sysctl', :git => 'https://github.com/duritong/puppet-sysctl', - :ref => 'master' + :ref => '847ec1c07ed3e231a48d8816971c0bd4afe7a72b' mod 'systemd', :git => 'https://github.com/camptocamp/puppet-systemd', - :ref => '8f68b0dcf3bbbafc60c025879a28004fc9815aab' + :ref => 'b008789640d03703e65072ae0b162b2054decb3f' mod 'vcsrepo', :git => 'https://github.com/puppetlabs/puppetlabs-vcsrepo', - :ref => 'main' + :ref => 'b82414b990ed614c6c53445481b947b2dcdfc126' mod 'xinetd', :git => 'https://github.com/puppetlabs/puppetlabs-xinetd', - :ref => 'master' + :ref => 'd7be36645a7490b60aa85e826de5d2885fbdd026' diff --git a/packstack/puppet/modules/packstack/manifests/neutron/ovn_agent.pp b/packstack/puppet/modules/packstack/manifests/neutron/ovn_agent.pp index a36baa1aa..8dfd1f58b 100644 --- a/packstack/puppet/modules/packstack/manifests/neutron/ovn_agent.pp +++ b/packstack/puppet/modules/packstack/manifests/neutron/ovn_agent.pp @@ -51,5 +51,6 @@ bridge_interface_mappings => $bridge_uplinks, ovn_encap_ip => force_ip($localip), hostname => $::fqdn, + ovn_cms_options => 'enable-chassis-as-gw', } } diff --git a/playbooks/packstack-centos9-pre.yaml b/playbooks/packstack-centos9-pre.yaml index a80e72895..9a9b12798 100644 --- a/playbooks/packstack-centos9-pre.yaml +++ b/playbooks/packstack-centos9-pre.yaml @@ -27,3 +27,10 @@ chdir: '{{ ansible_user_dir }}/workspace' become: true environment: '{{ zuul }}' + + # mariadb-10.11 is broken https://issues.redhat.com/browse/RDO-241 + - name: Temporary disable mariadb module + shell: "sudo dnf module disable -y mariadb" + when: ansible_distribution == "CentOS" and ansible_distribution_major_version == "9" + become: true + changed_when: False diff --git a/run_tests.sh b/run_tests.sh index 5b4b19888..1f1f9f755 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -26,8 +26,8 @@ OS_NAME_VERS=${ID}${VERSION_ID} # We could want to override the default repositories or install behavior INSTALL_FROM_SOURCE=${INSTALL_FROM_SOURCE:-true} MANAGE_REPOS=${MANAGE_REPOS:-true} -DELOREAN=${DELOREAN:-https://trunk.rdoproject.org/${OS_NAME_VERS}-master/current-passed-ci/delorean.repo} -DELOREAN_DEPS=${DELOREAN_DEPS:-https://trunk.rdoproject.org/${OS_NAME_VERS}-master/delorean-deps.repo} +DELOREAN=${DELOREAN:-https://trunk.rdoproject.org/${OS_NAME_VERS}-antelope/puppet-passed-ci/delorean.repo} +DELOREAN_DEPS=${DELOREAN_DEPS:-https://trunk.rdoproject.org/${OS_NAME_VERS}-antelope/delorean-deps.repo} GIT_BASE_URL=${GIT_BASE_URL:-https://git.openstack.org} ADDITIONAL_ARGS=${ADDITIONAL_ARGS:-} SELINUX_ENFORCING=${SELINUX_ENFORCING:-true} From b0194ffd2bccd757f6c5ace6e14de58c3e2222fa Mon Sep 17 00:00:00 2001 From: Joel Capitao Date: Mon, 16 Dec 2024 16:17:52 +0100 Subject: [PATCH 2/2] Remove definition of retired puppet projects Change-Id: I95310c6b961eab2f251b1ddf3218f202a79a3de8 --- .zuul.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index 6268a941f..87998a7bd 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -26,7 +26,6 @@ - openstack/puppet-oslo - openstack/puppet-ovn - openstack/puppet-placement - - openstack/puppet-sahara - openstack/puppet-swift - openstack/puppet-tempest - openstack/puppet-trove