From 9720a1265d56754ca88e4758e7cf886039e1b8d4 Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Fri, 4 Oct 2024 10:40:26 +0000 Subject: [PATCH 01/13] Update .gitreview for stable/2024.2 Change-Id: I7907d59c8ca51c212b5d06063fb9c6bbd2c4e383 --- .gitreview | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitreview b/.gitreview index 975ab6dbf..eca594fdc 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=review.opendev.org port=29418 project=openstack/puppet-openstack-integration.git +defaultbranch=stable/2024.2 From 407a4eed675eccc4c7f339700e39af9d9ccadd8d Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 5 Oct 2024 00:24:22 +0900 Subject: [PATCH 02/13] Switch to stable/2024.2 Since 2024.2 release was created we can start testing the release content. Note that Ubuntu continues using 2023.2 until 2024.2 is released in UCA. Change-Id: I8fe7c157b57ef0017f771982793b1fa76f19e5da --- Puppetfile | 60 +++++++++++++++++++++++----------------------- configure_facts.sh | 2 +- manifests/repos.pp | 4 ++-- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Puppetfile b/Puppetfile index deaba7238..5856cf5df 100644 --- a/Puppetfile +++ b/Puppetfile @@ -3,15 +3,15 @@ ## OpenStack modules mod 'aodh', :git => 'https://opendev.org/openstack/puppet-aodh', - :ref => 'master' + :ref => 'stable/2024.2' mod 'barbican', :git => 'https://opendev.org/openstack/puppet-barbican', - :ref => 'master' + :ref => 'stable/2024.2' mod 'ceilometer', :git => 'https://opendev.org/openstack/puppet-ceilometer', - :ref => 'master' + :ref => 'stable/2024.2' mod 'ceph', :git => 'https://opendev.org/openstack/puppet-ceph', @@ -19,111 +19,111 @@ mod 'ceph', mod 'cinder', :git => 'https://opendev.org/openstack/puppet-cinder', - :ref => 'master' + :ref => 'stable/2024.2' mod 'cloudkitty', :git => 'https://opendev.org/openstack/puppet-cloudkitty', - :ref => 'master' + :ref => 'stable/2024.2' mod 'designate', :git => 'https://opendev.org/openstack/puppet-designate', - :ref => 'master' + :ref => 'stable/2024.2' mod 'glance', :git => 'https://opendev.org/openstack/puppet-glance', - :ref => 'master' + :ref => 'stable/2024.2' mod 'gnocchi', :git => 'https://opendev.org/openstack/puppet-gnocchi', - :ref => 'master' + :ref => 'stable/2024.2' mod 'heat', :git => 'https://opendev.org/openstack/puppet-heat', - :ref => 'master' + :ref => 'stable/2024.2' mod 'horizon', :git => 'https://opendev.org/openstack/puppet-horizon', - :ref => 'master' + :ref => 'stable/2024.2' mod 'ironic', :git => 'https://opendev.org/openstack/puppet-ironic', - :ref => 'master' + :ref => 'stable/2024.2' mod 'keystone', :git => 'https://opendev.org/openstack/puppet-keystone', - :ref => 'master' + :ref => 'stable/2024.2' mod 'magnum', :git => 'https://opendev.org/openstack/puppet-magnum', - :ref => 'master' + :ref => 'stable/2024.2' mod 'manila', :git => 'https://opendev.org/openstack/puppet-manila', - :ref => 'master' + :ref => 'stable/2024.2' mod 'mistral', :git => 'https://opendev.org/openstack/puppet-mistral', - :ref => 'master' + :ref => 'stable/2024.2' mod 'neutron', :git => 'https://opendev.org/openstack/puppet-neutron', - :ref => 'master' + :ref => 'stable/2024.2' mod 'nova', :git => 'https://opendev.org/openstack/puppet-nova', - :ref => 'master' + :ref => 'stable/2024.2' mod 'octavia', :git => 'https://opendev.org/openstack/puppet-octavia', - :ref => 'master' + :ref => 'stable/2024.2' mod 'openstack_extras', :git => 'https://opendev.org/openstack/puppet-openstack_extras', - :ref => 'master' + :ref => 'stable/2024.2' mod 'openstacklib', :git => 'https://opendev.org/openstack/puppet-openstacklib', - :ref => 'master' + :ref => 'stable/2024.2' mod 'oslo', :git => 'https://opendev.org/openstack/puppet-oslo', - :ref => 'master' + :ref => 'stable/2024.2' mod 'ovn', :git => 'https://opendev.org/openstack/puppet-ovn', - :ref => 'master' + :ref => 'stable/2024.2' mod 'placement', :git => 'https://opendev.org/openstack/puppet-placement', - :ref => 'master' + :ref => 'stable/2024.2' mod 'swift', :git => 'https://opendev.org/openstack/puppet-swift', - :ref => 'master' + :ref => 'stable/2024.2' mod 'tempest', :git => 'https://opendev.org/openstack/puppet-tempest', - :ref => 'master' + :ref => 'stable/2024.2' mod 'trove', :git => 'https://opendev.org/openstack/puppet-trove', - :ref => 'master' + :ref => 'stable/2024.2' mod 'vswitch', :git => 'https://opendev.org/openstack/puppet-vswitch', - :ref => 'master' + :ref => 'stable/2024.2' mod 'vitrage', :git => 'https://opendev.org/openstack/puppet-vitrage', - :ref => 'master' + :ref => 'stable/2024.2' mod 'watcher', :git => 'https://opendev.org/openstack/puppet-watcher', - :ref => 'master' + :ref => 'stable/2024.2' mod 'zaqar', :git => 'https://opendev.org/openstack/puppet-zaqar', - :ref => 'master' + :ref => 'stable/2024.2' ## External modules mod 'kmod', diff --git a/configure_facts.sh b/configure_facts.sh index 745915fa1..c6787fda1 100644 --- a/configure_facts.sh +++ b/configure_facts.sh @@ -18,7 +18,7 @@ export OS_NAME_VERS=${ID}${VERSION_ID} # Write out facts to the facter folder when we generate them. export WRITE_FACTS=${WRITE_FACTS:-true} -export OPENSTACK_VERSION=${OPENSTACK_VERSION:-master} +export OPENSTACK_VERSION=${OPENSTACK_VERSION:-dalmatian} export DLRN_TAG=${DLRN_TAG:-puppet-passed-ci} export DLRN_ROOT=${DLRN_ROOT:-${OS_NAME_VERS}-${OPENSTACK_VERSION}} export DLRN_BASE=${DLRN_BASE:-${DLRN_ROOT}/${DLRN_TAG}} diff --git a/manifests/repos.pp b/manifests/repos.pp index 583cf9a8f..efd20f11c 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -51,11 +51,11 @@ ) $delorean_repo = pick( $facts['delorean_repo_path'], - "https://trunk.rdoproject.org/centos${facts['os']['release']['major']}-master/puppet-passed-ci/delorean.repo" + "https://trunk.rdoproject.org/centos${facts['os']['release']['major']}-dalmatian/puppet-passed-ci/delorean.repo" ) $delorean_deps_repo = pick( $facts['delorean_deps_repo_path'], - "https://trunk.rdoproject.org/centos${facts['os']['release']['major']}-master/delorean-deps.repo" + "https://trunk.rdoproject.org/centos${facts['os']['release']['major']}-dalmatian/delorean-deps.repo" ) class { 'openstack_extras::repo::redhat::redhat': From a1062bd116f6afd283179858c413367fd49eac95 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 5 Oct 2024 16:22:25 +0900 Subject: [PATCH 03/13] Hard-code service type for cinder Tempest recently changed the default [volume] catalog_type to use official name[1]. Hard-code the old value until we establish the solution to adopt to the change. [1] https://review.opendev.org/c/openstack/tempest/+/930296 Backport note: The issue was fixed by new block-sotrage service type but it's not backportable so we backport this workaround to fix failing tempest tests in Ubuntu Jobs. Change-Id: I0ee92d93e065b829faa5871e5a4d92794c9b3f8e (cherry picked from commit e6345da838c1168b6e7018ade67c7108c05c1472) --- manifests/tempest.pp | 1 + 1 file changed, 1 insertion(+) diff --git a/manifests/tempest.pp b/manifests/tempest.pp index d7a0506b7..e53d6a1b7 100644 --- a/manifests/tempest.pp +++ b/manifests/tempest.pp @@ -330,6 +330,7 @@ vitrage_available => $vitrage, gnocchi_available => $gnocchi, watcher_available => $watcher, + volume_catalog_type => 'volumev3', public_network_name => 'public', neutron_api_extensions => join(any2array($neutron_api_extensions_real), ','), dashboard_url => $dashboard_url, From e9ca68508f55fd7cbe24ecbba1bc5439ed74ecfc Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 14 Oct 2024 13:30:00 +0900 Subject: [PATCH 04/13] Avoid using internal exec resources for dependencies ... so that we can refactor resources in ceph::pool. Change-Id: I98c66422b92a5a1b64ab90f646713f60b175645e (cherry picked from commit 9e4cd7852e7dd321e42dcd77a0664362120030d7) --- manifests/cinder.pp | 4 ++-- manifests/glance.pp | 2 +- manifests/gnocchi.pp | 2 +- manifests/nova.pp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manifests/cinder.pp b/manifests/cinder.pp index 6db9f16f4..5cd1f88cd 100644 --- a/manifests/cinder.pp +++ b/manifests/cinder.pp @@ -162,7 +162,7 @@ manage_volume_type => true, } # make sure ceph pool exists before running Cinder Volume - Exec['create-cinder'] -> Service['cinder-volume'] + Ceph::Pool['cinder'] -> Service['cinder-volume'] } default: { fail("Unsupported backend (${backend})") @@ -191,7 +191,7 @@ backup_ceph_user => 'openstack', } # make sure ceph pool exists before running Cinder Backup - Exec['create-backups'] -> Service['cinder-backup'] + Ceph::Pool['backups'] -> Service['cinder-backup'] } default: {} } diff --git a/manifests/glance.pp b/manifests/glance.pp index 35fca9580..9e6b3038f 100644 --- a/manifests/glance.pp +++ b/manifests/glance.pp @@ -70,7 +70,7 @@ rbd_store_pool => 'glance', } # make sure ceph pool exists before running Glance API - Exec['create-glance'] -> Service['glance-api'] + Ceph::Pool['glance'] -> Service['glance-api'] $default_backend = 'rbd1' } 'swift': { diff --git a/manifests/gnocchi.pp b/manifests/gnocchi.pp index ab9483074..e8cab4f1a 100644 --- a/manifests/gnocchi.pp +++ b/manifests/gnocchi.pp @@ -108,7 +108,7 @@ manage_rados => true, } # make sure ceph pool exists before running gnocchi (dbsync & services) - Exec['create-gnocchi'] -> Exec['gnocchi-db-sync'] + Ceph::Pool['gnocchi'] -> Anchor['gnocchi::dbsync::begin'] } 'swift': { class { 'gnocchi::storage::swift': diff --git a/manifests/nova.pp b/manifests/nova.pp index 5ae2d7ef5..bf7cd168a 100644 --- a/manifests/nova.pp +++ b/manifests/nova.pp @@ -265,7 +265,7 @@ manage_ceph_client => false, } # make sure ceph pool exists before running nova-compute - Exec['create-nova'] -> Service['nova-compute'] + Ceph::Pool['nova'] -> Service['nova-compute'] } else { include openstacklib::iscsid Service['iscsid'] -> Service['nova-compute'] From 095f884c8196a4e0dca8e68addd069c9c5599e32 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 20 Oct 2024 01:20:33 +0900 Subject: [PATCH 05/13] nova: Stop overriding modular_libvirt We intended to enable modular libvirt in CentOS but actually it was disabled because of the remaining override. Change-Id: Ia102278df53268965b8bd4edbf6906f1373cafe9 (cherry picked from commit 12475c878601aa985c2ee11a94cb8d6e5ca63de4) --- manifests/nova.pp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/manifests/nova.pp b/manifests/nova.pp index bf7cd168a..5ae8606a8 100644 --- a/manifests/nova.pp +++ b/manifests/nova.pp @@ -14,11 +14,6 @@ # Possible values include custom, host-model, none, host-passthrough. # Defaults to 'none' # -# [*modular_libvirt*] -# (optional) Use modular libvirt daemons instead of the monolithic libvirtd -# deamon -# Defaults to false -# # [*volume_encryption*] # (optional) Boolean to configure or not volume encryption # Defaults to false. @@ -39,7 +34,6 @@ $libvirt_rbd = false, $libvirt_virt_type = 'qemu', $libvirt_cpu_mode = 'none', - $modular_libvirt = false, $volume_encryption = false, $notification_topics = $facts['os_service_default'], $cinder_enabled = false, @@ -235,9 +229,8 @@ default => 'tcp' } class { 'nova::migration::libvirt': - transport => $migration_transport, - listen_address => $::openstack_integration::config::host, - modular_libvirt => $modular_libvirt, + transport => $migration_transport, + listen_address => $::openstack_integration::config::host, } $images_type = $libvirt_rbd ? { @@ -250,9 +243,7 @@ images_type => $images_type, manage_libvirt_services => false, } - class { 'nova::compute::libvirt::services': - modular_libvirt => $modular_libvirt, - } + class { 'nova::compute::libvirt::services': } class { 'nova::compute::libvirt::networks': } if $libvirt_rbd { class { 'nova::compute::rbd': From b04e9c25e3121d84efb3268c8c59ef101c78b5d7 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 3 Nov 2024 19:38:41 +0900 Subject: [PATCH 06/13] Use built-in venv module ... to get rid of virtualenv. The virtualenv package is not availble in CentOS and currently installed via pip. Change-Id: Ia258db30a0b1a426b66f402b4cc62ea6664de05a (cherry picked from commit 9c4016f9282c77040fdd571157f56a6df840c5eb) --- run_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run_tests.sh b/run_tests.sh index 5b101220a..97628a362 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -354,7 +354,7 @@ print_header 'Running Tempest' cd /tmp/openstack/tempest if [ "${TEMPEST_FROM_SOURCE,,}" = true ]; then - python3 -m virtualenv run_tempest + python3 -m venv run_tempest /tmp/openstack/tempest/run_tempest/bin/pip3 install -c https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt -U -r requirements.txt /tmp/openstack/tempest/run_tempest/bin/python3 setup.py install From 14e3076ad62b41451a3aa7f042f3f5b31cf77b04 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 9 Feb 2025 08:55:16 +0900 Subject: [PATCH 07/13] CentOS: Fix missing config files Some of the config files are placed directly in /etc . Make sure these files are captured. Change-Id: I70996df1cb693bcd8b3aa7b213633b361eb8f32a (cherry picked from commit 03380e72f256b85bdb6ed03f5f9dc6e17d335c8b) --- copy_logs.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/copy_logs.sh b/copy_logs.sh index 5067967eb..0221cf242 100755 --- a/copy_logs.sh +++ b/copy_logs.sh @@ -170,9 +170,16 @@ if [ -d /etc/named ]; then if [ -f /etc/rndc.conf ]; then sudo cp -r /etc/rndc.conf $LOG_DIR/rndc.conf fi -elif [ -d /etc/bind ]; then +fi +if [ -d /etc/bind ]; then sudo cp -r /etc/bind $LOG_DIR/etc fi +if [ -f /etc/rndc.key ]; then + sudo cp /etc/rndc.key $LOG_DIR/etc +fi +if [ -f /etc/named.conf ]; then + sudo cp /etc/named.conf $LOG_DIR/etc +fi # tempest logs if [ -f /tmp/openstack/tempest/tempest.log ] ; then From 65af6d5d140974c83ec061ad29c19fe538a1c01a Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 23 Jan 2025 20:44:40 +0900 Subject: [PATCH 08/13] Promote puppet 8 jobs Puppet 7 is reaching its EOL very soon. Enable testing with Puppet 8 to prepare complete migration to Puppet 8. Note that litmus jobs are kept non-voting in this step but will later be made voting. Change-Id: I4578a2265f962ec38b7bddb19e0dfbb624d117de (cherry picked from commit ed57a60dccffe3d294314b768bec79707e34b9fa) --- zuul.d/integration.yaml | 1 - zuul.d/layout.yaml | 38 ++++++++++++-------------------------- zuul.d/libraries.yaml | 5 ++--- zuul.d/litmus.yaml | 12 +++++------- zuul.d/unit.yaml | 8 ++++---- 5 files changed, 23 insertions(+), 41 deletions(-) diff --git a/zuul.d/integration.yaml b/zuul.d/integration.yaml index f0c3a0284..08a31546a 100644 --- a/zuul.d/integration.yaml +++ b/zuul.d/integration.yaml @@ -117,7 +117,6 @@ name: puppet-openstack-integration-8 parent: puppet-openstack-integration-run-base abstract: true - voting: false vars: puppet: 8 diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index 71fd899e3..dc74548c9 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -30,10 +30,11 @@ - puppet-openstack-libraries-puppet-syntax-8-centos-9-stream - puppet-openstack-libraries-puppet-unit-7.32-centos-9-stream - puppet-openstack-libraries-puppet-unit-7.32-ubuntu-jammy - - puppet-openstack-libraries-puppet-unit-8.8-centos-9-stream + - puppet-openstack-libraries-puppet-unit-8.10-centos-9-stream - puppet-openstack-libraries-puppet-unit-latest-ubuntu-jammy - puppet-openstack-libraries-litmus-7.32-centos-9-stream - puppet-openstack-libraries-litmus-7.32-ubuntu-jammy + - puppet-openstack-libraries-litmus-8.10-centos-9-stream - puppet-openstack-libraries-litmus-latest-ubuntu-jammy gate: jobs: @@ -42,9 +43,6 @@ - puppet-openstack-libraries-puppet-unit-7.32-centos-9-stream - puppet-openstack-libraries-puppet-unit-7.32-ubuntu-jammy - puppet-openstack-libraries-litmus-7.32-centos-9-stream - experimental: - jobs: - - puppet-openstack-libraries-litmus-8.8-centos-9-stream # integration jobs - project-template: @@ -61,6 +59,11 @@ - puppet-openstack-integration-7-scenario003-tempest-centos-9-stream - puppet-openstack-integration-7-scenario004-tempest-centos-9-stream - puppet-openstack-integration-7-scenario005-tempest-centos-9-stream + - puppet-openstack-integration-8-scenario001-tempest-centos-9-stream + - puppet-openstack-integration-8-scenario002-tempest-centos-9-stream + - puppet-openstack-integration-8-scenario003-tempest-centos-9-stream + - puppet-openstack-integration-8-scenario004-tempest-centos-9-stream + - puppet-openstack-integration-8-scenario005-tempest-centos-9-stream gate: jobs: - puppet-openstack-integration-7-scenario001-tempest-centos-9-stream @@ -68,13 +71,6 @@ - puppet-openstack-integration-7-scenario003-tempest-centos-9-stream - puppet-openstack-integration-7-scenario004-tempest-centos-9-stream - puppet-openstack-integration-7-scenario005-tempest-centos-9-stream - experimental: - jobs: - - puppet-openstack-integration-8-scenario001-tempest-centos-9-stream - - puppet-openstack-integration-8-scenario002-tempest-centos-9-stream - - puppet-openstack-integration-8-scenario003-tempest-centos-9-stream - - puppet-openstack-integration-8-scenario004-tempest-centos-9-stream - - puppet-openstack-integration-8-scenario005-tempest-centos-9-stream - project-template: name: puppet-openstack-integration-jobs-scenario001 @@ -82,12 +78,10 @@ jobs: - puppet-openstack-integration-7-scenario001-tempest-ubuntu-jammy - puppet-openstack-integration-7-scenario001-tempest-centos-9-stream + - puppet-openstack-integration-8-scenario001-tempest-centos-9-stream gate: jobs: - puppet-openstack-integration-7-scenario001-tempest-centos-9-stream - experimental: - jobs: - - puppet-openstack-integration-8-scenario001-tempest-centos-9-stream - project-template: name: puppet-openstack-integration-jobs-scenario002 @@ -95,12 +89,10 @@ jobs: - puppet-openstack-integration-7-scenario002-tempest-ubuntu-jammy - puppet-openstack-integration-7-scenario002-tempest-centos-9-stream + - puppet-openstack-integration-8-scenario002-tempest-centos-9-stream gate: jobs: - puppet-openstack-integration-7-scenario002-tempest-centos-9-stream - experimental: - jobs: - - puppet-openstack-integration-8-scenario002-tempest-centos-9-stream - project-template: name: puppet-openstack-integration-jobs-scenario003 @@ -108,12 +100,10 @@ jobs: - puppet-openstack-integration-7-scenario003-tempest-ubuntu-jammy - puppet-openstack-integration-7-scenario003-tempest-centos-9-stream + - puppet-openstack-integration-8-scenario003-tempest-centos-9-stream gate: jobs: - puppet-openstack-integration-7-scenario003-tempest-centos-9-stream - experimental: - jobs: - - puppet-openstack-integration-8-scenario003-tempest-centos-9-stream - project-template: name: puppet-openstack-integration-jobs-scenario004 @@ -121,12 +111,10 @@ jobs: - puppet-openstack-integration-7-scenario004-tempest-ubuntu-jammy - puppet-openstack-integration-7-scenario004-tempest-centos-9-stream + - puppet-openstack-integration-8-scenario004-tempest-centos-9-stream gate: jobs: - puppet-openstack-integration-7-scenario004-tempest-centos-9-stream - experimental: - jobs: - - puppet-openstack-integration-8-scenario004-tempest-centos-9-stream - project-template: name: puppet-openstack-integration-jobs-scenario005 @@ -134,9 +122,7 @@ jobs: - puppet-openstack-integration-7-scenario005-tempest-ubuntu-jammy - puppet-openstack-integration-7-scenario005-tempest-centos-9-stream + - puppet-openstack-integration-8-scenario005-tempest-centos-9-stream gate: jobs: - puppet-openstack-integration-7-scenario005-tempest-centos-9-stream - experimental: - jobs: - - puppet-openstack-integration-8-scenario005-tempest-centos-9-stream diff --git a/zuul.d/libraries.yaml b/zuul.d/libraries.yaml index 1da2ab140..078d0341c 100644 --- a/zuul.d/libraries.yaml +++ b/zuul.d/libraries.yaml @@ -16,12 +16,11 @@ puppet_gem_version: 7.32 - job: - name: puppet-openstack-libraries-puppet-unit-8.8-centos-9-stream + name: puppet-openstack-libraries-puppet-unit-8.10-centos-9-stream parent: puppet-openstack-libraries-puppet-unit-base nodeset: centos-9-stream - voting: false vars: - puppet_gem_version: 8.8 + puppet_gem_version: 8.10 dnf_modules: ruby: 3.1 diff --git a/zuul.d/litmus.yaml b/zuul.d/litmus.yaml index 43f078a3a..0fe5e85a2 100644 --- a/zuul.d/litmus.yaml +++ b/zuul.d/litmus.yaml @@ -57,12 +57,12 @@ puppet_gem_version: 7.32 - job: - name: puppet-openstack-litmus-8.8-centos-9-stream + name: puppet-openstack-litmus-8.10-centos-9-stream parent: puppet-openstack-litmus-module-base nodeset: centos-9-stream voting: false vars: - puppet_gem_version: 8.8 + puppet_gem_version: 8.10 dnf_modules: ruby: 3.1 @@ -90,12 +90,12 @@ puppet_gem_version: 7.32 - job: - name: puppet-openstack-libraries-litmus-8.8-centos-9-stream + name: puppet-openstack-libraries-litmus-8.10-centos-9-stream parent: puppet-openstack-litmus-libraries-base nodeset: centos-9-stream voting: false vars: - puppet_gem_version: 8.8 + puppet_gem_version: 8.10 dnf_modules: ruby: 3.1 @@ -113,10 +113,8 @@ jobs: - puppet-openstack-litmus-7.32-centos-9-stream - puppet-openstack-litmus-7.32-ubuntu-jammy + - puppet-openstack-litmus-8.10-centos-9-stream - puppet-openstack-litmus-latest-ubuntu-jammy gate: jobs: - puppet-openstack-litmus-7.32-centos-9-stream - experimental: - jobs: - - puppet-openstack-litmus-8.8-centos-9-stream diff --git a/zuul.d/unit.yaml b/zuul.d/unit.yaml index 0339e1537..2074d8749 100644 --- a/zuul.d/unit.yaml +++ b/zuul.d/unit.yaml @@ -16,12 +16,11 @@ puppet_gem_version: 7.32 - job: - name: puppet-openstack-unit-8.8-centos-9-stream + name: puppet-openstack-unit-8.10-centos-9-stream parent: puppet-openstack-unit-base nodeset: centos-9-stream - voting: false vars: - puppet_gem_version: 8.8 + puppet_gem_version: 8.10 dnf_modules: ruby: 3.1 @@ -39,9 +38,10 @@ jobs: - puppet-openstack-unit-7.32-centos-9-stream - puppet-openstack-unit-7.32-ubuntu-jammy - - puppet-openstack-unit-8.8-centos-9-stream + - puppet-openstack-unit-8.10-centos-9-stream - puppet-openstack-unit-latest-ubuntu-jammy gate: jobs: - puppet-openstack-unit-7.32-centos-9-stream - puppet-openstack-unit-7.32-ubuntu-jammy + - puppet-openstack-unit-8.10-centos-9-stream From 4e9e1e6ed9117155b6777d82052d31ea7c7ca87f Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 14 Feb 2025 00:12:53 +0900 Subject: [PATCH 09/13] Unpin bundler in litmus We removed the pin for the other jobs by [1]. [1] c03f2eaf7a7aa0d5a6a4e86c8dc1ebc01f2fc928 Change-Id: Ic133a697c9aa240fb5eb1b4f7e904ede010ead33 (cherry picked from commit 177c53a2cc6c6d64fe5e94d2bdd4fca343e8760b) --- playbooks/run-litmus-tests.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/playbooks/run-litmus-tests.yaml b/playbooks/run-litmus-tests.yaml index 5ae818091..c54cde033 100644 --- a/playbooks/run-litmus-tests.yaml +++ b/playbooks/run-litmus-tests.yaml @@ -20,7 +20,6 @@ export GEM_BIN_DIR=$GEM_HOME/bin ruby < Date: Fri, 7 Mar 2025 13:44:27 +0900 Subject: [PATCH 10/13] CentOS: Fix IP version in scenario002 We unintentionally switched the IP version used in this scenario from v6 to v4. Fix it to use the consistent version across the scenarios. Change-Id: I37fd407852a600e3e80cfecc3ac6ad5fb6d77d66 (cherry picked from commit f5ff5d0fde80b3d1d6dcdc9fdcfc0508676be940) --- fixtures/scenario002.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fixtures/scenario002.pp b/fixtures/scenario002.pp index f38eefb9e..52286f08a 100644 --- a/fixtures/scenario002.pp +++ b/fixtures/scenario002.pp @@ -28,7 +28,7 @@ $tooz_backend = 'redis' } 'RedHat': { - $ipv6 = false + $ipv6 = true $cache_backend = 'redis_sentinel' $django_cache_backend = 'redis' $tooz_backend = 'redis_sentinel' From e880c95ee09460c4e9619604d53291bbe3b92695 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 6 Apr 2025 22:50:36 +0900 Subject: [PATCH 11/13] Fix wrong command to install n-t-p Change-Id: I88782bc32ecc6cdee47982a67dac8160112d0a3e (cherry picked from commit a24472d3d87cc3b43bb0e83dbd368379d563c03d) --- run_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run_tests.sh b/run_tests.sh index 97628a362..a18abb6e8 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -367,7 +367,7 @@ if [ "${TEMPEST_FROM_SOURCE,,}" = true ]; then fi pushd /tmp/openstack/neutron-tempest-plugin /tmp/openstack/tempest/run_tempest/bin/pip3 install -c https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt -U -r requirements.txt - /tmp/openstack/tempest/run_tempest/bin/pip3 setup.py install + /tmp/openstack/tempest/run_tempest/bin/python3 setup.py install popd run_tempest/bin/pip3 install os-testr From c7dec26dd6ba7e0b0bba804a626288ea4a62ddbf Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 19 Apr 2025 21:16:48 +0900 Subject: [PATCH 12/13] ceilometer: Fix wrong memcache server format The inet6 prefix should NOT be added when the pymemcache backend is used. Change-Id: I6cf25aa19af9f35aadf72757c85e4efe0601b57f (cherry picked from commit 8e42b85662837fdcfa3db353ee12ae31c6a4b876) (cherry picked from commit c40c78037da908630b46f699559d13637bc1d0df) --- manifests/ceilometer.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/ceilometer.pp b/manifests/ceilometer.pp index aae12547a..a3b7e8152 100644 --- a/manifests/ceilometer.pp +++ b/manifests/ceilometer.pp @@ -27,7 +27,7 @@ class { 'ceilometer::cache': backend => $::openstack_integration::config::cache_driver, enabled => true, - memcache_servers => $::openstack_integration::config::memcached_servers, + memcache_servers => $::openstack_integration::config::memcache_servers, redis_server => $::openstack_integration::config::redis_server, redis_password => 'a_big_secret', redis_sentinels => $::openstack_integration::config::redis_sentinel_server, From 353a4224b1b5b8e1a319fd9df6c9a9633addb5b2 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 25 Feb 2026 22:24:43 +0900 Subject: [PATCH 13/13] Install libffi package ... to fix the failure during installing fiddle. Also fix Redis idempotency. Change-Id: I90644b6f03208fb0e41f18bf53b89281af764aaf Signed-off-by: Takashi Kajinami Signed-off-by: Tobias Urdin (cherry picked from commit faeb9c58bfec2ffc53328e771be7fae89f32d70f) (cherry picked from commit b167ca32792577b4c1b0ff5161d283180ac25acf) (cherry picked from commit 05ead8b0dabca26068dcc7889e3a9ebb3c3cc0c3) --- Puppetfile | 5 +++-- manifests/ssl_key.pp | 6 +++--- playbooks/prepare-node-common.yaml | 3 +++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Puppetfile b/Puppetfile index 5856cf5df..9c47333c3 100644 --- a/Puppetfile +++ b/Puppetfile @@ -184,7 +184,7 @@ mod 'memcached', mod 'dns', :git => 'https://github.com/theforeman/puppet-dns', - :ref => '11.0.0' + :ref => '12.1.0' mod 'archive', :git => 'https://github.com/voxpupuli/puppet-archive', @@ -196,7 +196,8 @@ mod 'ssh_keygen', mod 'redis', :git => 'https://github.com/voxpupuli/puppet-redis', - :ref => 'v11.0.0' + # NOTE(tkajinam): Temporal bump to fix broken idempotency + :ref => '27a95724b0a9597bbd9a314a96ff47da7eaaac18' mod 'systemd', :git => 'https://github.com/voxpupuli/puppet-systemd', diff --git a/manifests/ssl_key.pp b/manifests/ssl_key.pp index 1091e1558..3a5296468 100644 --- a/manifests/ssl_key.pp +++ b/manifests/ssl_key.pp @@ -27,13 +27,13 @@ file { "/etc/${name}/ssl": ensure => directory, owner => $key_owner, - mode => '0775', + mode => '0750', selinux_ignore_defaults => true, } file { "/etc/${name}/ssl/private": ensure => directory, owner => $key_owner, - mode => '0755', + mode => '0750', require => File["/etc/${name}/ssl"], selinux_ignore_defaults => true, before => File[$_key_path] @@ -45,6 +45,6 @@ owner => $key_owner, source => "puppet:///modules/openstack_integration/ipv${openstack_integration::config::ip_version}.key", selinux_ignore_defaults => true, - mode => '0600', + mode => '0640', } } diff --git a/playbooks/prepare-node-common.yaml b/playbooks/prepare-node-common.yaml index 7f39d55dd..289d7ea62 100644 --- a/playbooks/prepare-node-common.yaml +++ b/playbooks/prepare-node-common.yaml @@ -44,6 +44,7 @@ - zlib-devel - langpacks-en - glibc-langpack-en + - libffi-devel when: - ansible_os_family == 'RedHat' @@ -73,6 +74,7 @@ - libxslt-dev - ruby-dev - zlib1g-dev + - libffi-dev - python3-pip - name: Install Ruby dependencies (Debian) @@ -88,4 +90,5 @@ - libxslt1-dev - ruby-dev - zlib1g-dev + - libffi-dev - python3-pip