From 459ccf1e26646b98e1e9df8c080918e982430f95 Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Fri, 22 May 2026 12:11:09 +0000 Subject: [PATCH 1/3] Update .gitreview for stable/2026.1 Change-Id: I0778877591e00c02e3fe083ec80ad2c1bf919b5d Signed-off-by: OpenStack Release Bot Generated-By: openstack/project-config:roles/copy-release-tools-scripts/files/release-tools/functions --- .gitreview | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitreview b/.gitreview index 975ab6dbf..9abc4d3be 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=review.opendev.org port=29418 project=openstack/puppet-openstack-integration.git +defaultbranch=stable/2026.1 From 7102545b86fde450913166136a2ee70c993cab14 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 23 May 2026 00:55:14 +0900 Subject: [PATCH 2/3] Switch to stable/2026.1 Change-Id: Ib571229710044d55b7a1934445234ef5a81dbf2b Signed-off-by: Takashi Kajinami --- Puppetfile | 58 +++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/Puppetfile b/Puppetfile index f5912085a..959e4b889 100644 --- a/Puppetfile +++ b/Puppetfile @@ -3,15 +3,15 @@ ## OpenStack modules mod 'aodh', :git => 'https://opendev.org/openstack/puppet-aodh', - :ref => 'master' + :ref => 'stable/2026.1' mod 'barbican', :git => 'https://opendev.org/openstack/puppet-barbican', - :ref => 'master' + :ref => 'stable/2026.1' mod 'ceilometer', :git => 'https://opendev.org/openstack/puppet-ceilometer', - :ref => 'master' + :ref => 'stable/2026.1' mod 'ceph', :git => 'https://opendev.org/openstack/puppet-ceph', @@ -19,107 +19,107 @@ mod 'ceph', mod 'cinder', :git => 'https://opendev.org/openstack/puppet-cinder', - :ref => 'master' + :ref => 'stable/2026.1' mod 'cloudkitty', :git => 'https://opendev.org/openstack/puppet-cloudkitty', - :ref => 'master' + :ref => 'stable/2026.1' mod 'designate', :git => 'https://opendev.org/openstack/puppet-designate', - :ref => 'master' + :ref => 'stable/2026.1' mod 'glance', :git => 'https://opendev.org/openstack/puppet-glance', - :ref => 'master' + :ref => 'stable/2026.1' mod 'gnocchi', :git => 'https://opendev.org/openstack/puppet-gnocchi', - :ref => 'master' + :ref => 'stable/2026.1' mod 'heat', :git => 'https://opendev.org/openstack/puppet-heat', - :ref => 'master' + :ref => 'stable/2026.1' mod 'horizon', :git => 'https://opendev.org/openstack/puppet-horizon', - :ref => 'master' + :ref => 'stable/2026.1' mod 'ironic', :git => 'https://opendev.org/openstack/puppet-ironic', - :ref => 'master' + :ref => 'stable/2026.1' mod 'keystone', :git => 'https://opendev.org/openstack/puppet-keystone', - :ref => 'master' + :ref => 'stable/2026.1' mod 'magnum', :git => 'https://opendev.org/openstack/puppet-magnum', - :ref => 'master' + :ref => 'stable/2026.1' mod 'manila', :git => 'https://opendev.org/openstack/puppet-manila', - :ref => 'master' + :ref => 'stable/2026.1' mod 'mistral', :git => 'https://opendev.org/openstack/puppet-mistral', - :ref => 'master' + :ref => 'stable/2026.1' mod 'neutron', :git => 'https://opendev.org/openstack/puppet-neutron', - :ref => 'master' + :ref => 'stable/2026.1' mod 'nova', :git => 'https://opendev.org/openstack/puppet-nova', - :ref => 'master' + :ref => 'stable/2026.1' mod 'octavia', :git => 'https://opendev.org/openstack/puppet-octavia', - :ref => 'master' + :ref => 'stable/2026.1' mod 'openstack_extras', :git => 'https://opendev.org/openstack/puppet-openstack_extras', - :ref => 'master' + :ref => 'stable/2026.1' mod 'openstacklib', :git => 'https://opendev.org/openstack/puppet-openstacklib', - :ref => 'master' + :ref => 'stable/2026.1' mod 'oslo', :git => 'https://opendev.org/openstack/puppet-oslo', - :ref => 'master' + :ref => 'stable/2026.1' mod 'ovn', :git => 'https://opendev.org/openstack/puppet-ovn', - :ref => 'master' + :ref => 'stable/2026.1' mod 'placement', :git => 'https://opendev.org/openstack/puppet-placement', - :ref => 'master' + :ref => 'stable/2026.1' mod 'swift', :git => 'https://opendev.org/openstack/puppet-swift', - :ref => 'master' + :ref => 'stable/2026.1' mod 'tempest', :git => 'https://opendev.org/openstack/puppet-tempest', - :ref => 'master' + :ref => 'stable/2026.1' mod 'trove', :git => 'https://opendev.org/openstack/puppet-trove', - :ref => 'master' + :ref => 'stable/2026.1' mod 'vswitch', :git => 'https://opendev.org/openstack/puppet-vswitch', - :ref => 'master' + :ref => 'stable/2026.1' mod 'watcher', :git => 'https://opendev.org/openstack/puppet-watcher', - :ref => 'master' + :ref => 'stable/2026.1' mod 'zaqar', :git => 'https://opendev.org/openstack/puppet-zaqar', - :ref => 'master' + :ref => 'stable/2026.1' ## External modules mod 'kmod', From 85763da2ca167eb792ec0eaa81a59acf6dba12b5 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 22 Jun 2026 21:13:21 +0900 Subject: [PATCH 3/3] Use upstream repository to install puppetlabs packages It seems their upstream rsync server no longer provides any content. Change-Id: Ic092fdcceda75c48fbb1d71fa89a0d504702c28d Signed-off-by: Takashi Kajinami (cherry picked from commit dbb23911d56160654971ee788754c8b37dccb9d2) --- configure_facts.sh | 10 ---------- functions | 12 ++++++------ 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/configure_facts.sh b/configure_facts.sh index 07ddd4d73..3f7065be2 100644 --- a/configure_facts.sh +++ b/configure_facts.sh @@ -35,20 +35,10 @@ if [ "${USE_MIRROR,,}" = true ] && [ -f /etc/ci/mirror_info.sh ]; then CENTOS_MIRROR_HOST="http://${NODEPOOL_MIRROR_HOST}/centos-stream" # TODO(tkajinam): Remove this once UCA Gazpacho is officially released. NODEPOOL_UCA_MIRROR='http://ubuntu-cloud.archive.canonical.com/ubuntu' - if uses_debs; then - NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/apt-puppetlabs" - else - NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/yum-puppetlabs" - fi else CENTOS_MIRROR_HOST='http://mirror.stream.centos.org' NODEPOOL_RDO_PROXY='https://trunk.rdoproject.org' NODEPOOL_UCA_MIRROR='http://ubuntu-cloud.archive.canonical.com/ubuntu' - if uses_debs; then - NODEPOOL_PUPPETLABS_MIRROR='https://apt.puppetlabs.com' - else - NODEPOOL_PUPPETLABS_MIRROR="https://yum.puppetlabs.com" - fi fi export FACTER_openstack_version=${OPENSTACK_VERSION} diff --git a/functions b/functions index ca497a5d0..55dff611c 100644 --- a/functions +++ b/functions @@ -180,19 +180,19 @@ install_puppetlabs_repo() { source /etc/os-release if uses_debs; then $SUDO mkdir -p /etc/apt/sources.list.d - echo "deb ${NODEPOOL_PUPPETLABS_MIRROR} ${VERSION_CODENAME} puppet${PUPPET_MAJ_VERSION}" | $SUDO tee /etc/apt/sources.list.d/puppetlabs.list + echo "deb https://apt.puppetlabs.com ${VERSION_CODENAME} puppet${PUPPET_MAJ_VERSION}" | $SUDO tee /etc/apt/sources.list.d/puppetlabs.list $SUDO apt-key add files/GPG-KEY-puppetlabs $SUDO apt-key add files/GPG-KEY-ceph $SUDO apt-get update elif is_fedora; then - $SUDO rpm --import ${NODEPOOL_PUPPETLABS_MIRROR}/RPM-GPG-KEY-puppet - $SUDO rpm --import ${NODEPOOL_PUPPETLABS_MIRROR}/RPM-GPG-KEY-puppet-20250406 + $SUDO rpm --import https://yum.puppetlabs.com/RPM-GPG-KEY-puppet + $SUDO rpm --import https://yum.puppetlabs.com/RPM-GPG-KEY-puppet-20250406 $SUDO bash -c "cat << EOF > /etc/yum.repos.d/puppetlabs.repo [puppetlabs-products] name=Puppet Labs Products El ${VERSION_ID} - x86_64 -baseurl=${NODEPOOL_PUPPETLABS_MIRROR}/puppet${PUPPET_MAJ_VERSION}/el/${VERSION_ID}/x86_64/ -gpgkey=${NODEPOOL_PUPPETLABS_MIRROR}/RPM-GPG-KEY-puppet - ${NODEPOOL_PUPPETLABS_MIRROR}/RPM-GPG-KEY-puppet-20250406 +baseurl=https://yum.puppetlabs.com/puppet${PUPPET_MAJ_VERSION}/el/${VERSION_ID}/x86_64/ +gpgkey=https://yum.puppetlabs.com/RPM-GPG-KEY-puppet + https://yum.puppetlabs.com/RPM-GPG-KEY-puppet-20250406 enabled=1 gpgcheck=1 EOF"