From 0320e05a40ef0e0c60061f0b80cc616c9fda781d Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Thu, 22 Feb 2024 15:55:49 +0100 Subject: [PATCH 1/3] 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) --- .../modules/packstack/manifests/neutron/ovn_agent.pp | 1 + playbooks/packstack-centos9-pre.yaml | 7 +++++++ 2 files changed, 8 insertions(+) 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 From cd5411000558c78eb0075f210bffa081afba567f Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 18 Apr 2024 21:26:48 +0900 Subject: [PATCH 2/3] Switch to stable/2023.2 branh ... and also stop pulling puppet-sahara from master because the module was already retired. Change-Id: I16cfb3241ce6a0aa8a9f51829859d95d8db7586f --- .gitreview | 1 + Puppetfile | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/.gitreview b/.gitreview index 463987619..d8aea9649 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=review.opendev.org port=29418 project=x/packstack.git +defaultbranch=stable/2023.2 diff --git a/Puppetfile b/Puppetfile index 235101ad8..2090235a5 100755 --- a/Puppetfile +++ b/Puppetfile @@ -4,95 +4,95 @@ moduledir '/usr/share/openstack-puppet/modules' mod 'aodh', :git => 'https://github.com/openstack/puppet-aodh', - :ref => 'master' + :ref => 'stable/2023.2' mod 'ceilometer', :git => 'https://github.com/openstack/puppet-ceilometer', - :ref => 'master' + :ref => 'stable/2023.2' mod 'cinder', :git => 'https://github.com/openstack/puppet-cinder', - :ref => 'master' + :ref => 'stable/2023.2' mod 'glance', :git => 'https://github.com/openstack/puppet-glance', - :ref => 'master' + :ref => 'stable/2023.2' mod 'gnocchi', :git => 'https://github.com/openstack/puppet-gnocchi', - :ref => 'master' + :ref => 'stable/2023.2' mod 'heat', :git => 'https://github.com/openstack/puppet-heat', - :ref => 'master' + :ref => 'stable/2023.2' mod 'magnum', :git => 'https://github.com/openstack/puppet-magnum', - :ref => 'master' + :ref => 'stable/2023.2' mod 'horizon', :git => 'https://github.com/openstack/puppet-horizon', - :ref => 'master' + :ref => 'stable/2023.2' mod 'ironic', :git => 'https://github.com/openstack/puppet-ironic', - :ref => 'master' + :ref => 'stable/2023.2' mod 'keystone', :git => 'https://github.com/openstack/puppet-keystone', - :ref => 'master' + :ref => 'stable/2023.2' mod 'manila', :git => 'https://github.com/openstack/puppet-manila', - :ref => 'master' + :ref => 'stable/2023.2' mod 'neutron', :git => 'https://github.com/openstack/puppet-neutron', - :ref => 'master' + :ref => 'stable/2023.2' mod 'nova', :git => 'https://github.com/openstack/puppet-nova', - :ref => 'master' + :ref => 'stable/2023.2' mod 'openstack_extras', :git => 'https://github.com/openstack/puppet-openstack_extras', - :ref => 'master' + :ref => 'stable/2023.2' mod 'openstacklib', :git => 'https://github.com/openstack/puppet-openstacklib', - :ref => 'master' + :ref => 'stable/2023.2' mod 'oslo', :git => 'https://github.com/openstack/puppet-oslo', - :ref => 'master' + :ref => 'stable/2023.2' mod 'ovn', :git => 'https://github.com/openstack/puppet-ovn', - :ref => 'master' + :ref => 'stable/2023.2' mod 'placement', :git => 'https://github.com/openstack/puppet-placement', - :ref => 'master' + :ref => 'stable/2023.2' mod 'sahara', - :git => 'https://github.com/openstack/puppet-sahara', - :ref => 'master' + :git => 'https://github.com/openstack-archive/puppet-sahara', + :ref => 'stable/2023.2' mod 'swift', :git => 'https://github.com/openstack/puppet-swift', - :ref => 'master' + :ref => 'stable/2023.2' mod 'tempest', :git => 'https://github.com/openstack/puppet-tempest', - :ref => 'master' + :ref => 'stable/2023.2' mod 'trove', :git => 'https://github.com/openstack/puppet-trove', - :ref => 'master' + :ref => 'stable/2023.2' mod 'vswitch', :git => 'https://github.com/openstack/puppet-vswitch', - :ref => 'master' + :ref => 'stable/2023.2' ## Non-OpenStack modules From 5996aa3f609f7a1f06a7be6a5444649f40160e36 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 4 Mar 2024 22:30:28 +0900 Subject: [PATCH 3/3] Fix branch to pull puppetlabs-xinetd The repository no longer has master and now the 'main' is the dev branch name. Change-Id: I793567f6b1a41bec448ba64a0e1ddb5066354988 (cherry picked from commit 142d245c5693ae1f8e1274a637b5da2b7056a681) --- Puppetfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Puppetfile b/Puppetfile index 2090235a5..c586750a0 100755 --- a/Puppetfile +++ b/Puppetfile @@ -162,5 +162,5 @@ mod 'vcsrepo', mod 'xinetd', :git => 'https://github.com/puppetlabs/puppetlabs-xinetd', - :ref => 'master' + :ref => 'main'