From 6a84dfb6d52290a4c6bdd52bf4e8ddd9707ed3c8 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 3 Oct 2023 16:49:58 +0900 Subject: [PATCH] Prepare 2023.2 release Change-Id: I39e3465dc4a8e17cee91058e08f482b45a2a5aa9 --- manifests/repo/debian/params.pp | 2 +- manifests/repo/redhat/params.pp | 2 +- metadata.json | 2 +- .../openstack_extras_repo_debian_debian_spec.rb | 14 +++++++------- .../openstack_extras_repo_debian_ubuntu_spec.rb | 6 +++--- .../openstack_extras_repo_redhat_redhat_spec.rb | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/manifests/repo/debian/params.pp b/manifests/repo/debian/params.pp index 335dda1..12ae8a7 100644 --- a/manifests/repo/debian/params.pp +++ b/manifests/repo/debian/params.pp @@ -4,7 +4,7 @@ # class openstack_extras::repo::debian::params { - $release = 'antelope' + $release = 'bobcat' $uca_name = 'ubuntu-cloud-archive' $uca_location = 'http://ubuntu-cloud.archive.canonical.com/ubuntu' diff --git a/manifests/repo/redhat/params.pp b/manifests/repo/redhat/params.pp index c9699b7..0ed076b 100644 --- a/manifests/repo/redhat/params.pp +++ b/manifests/repo/redhat/params.pp @@ -4,7 +4,7 @@ # OS family repo classes. # class openstack_extras::repo::redhat::params { - $release = 'antelope' + $release = 'bobcat' $centos_mirror_url = 'http://mirror.stream.centos.org' diff --git a/metadata.json b/metadata.json index 14c30e7..b57ca51 100644 --- a/metadata.json +++ b/metadata.json @@ -53,5 +53,5 @@ ], "source": "https://opendev.org/openstack/puppet-openstack_extras.git", "summary": "Puppet OpenStack Extras Module", - "version": "22.0.0" + "version": "23.0.0" } diff --git a/spec/classes/openstack_extras_repo_debian_debian_spec.rb b/spec/classes/openstack_extras_repo_debian_debian_spec.rb index ec23061..84a01bd 100644 --- a/spec/classes/openstack_extras_repo_debian_debian_spec.rb +++ b/spec/classes/openstack_extras_repo_debian_debian_spec.rb @@ -14,7 +14,7 @@ describe 'openstack_extras::repo::debian::debian' do let :paramclass_defaults do { - :release => 'antelope' + :release => 'bobcat' } end @@ -23,11 +23,11 @@ describe 'openstack_extras::repo::debian::debian' do end context 'with default params' do - it { should contain_exec('/usr/bin/extrepo enable openstack_antelope').with( + it { should contain_exec('/usr/bin/extrepo enable openstack_bobcat').with( :command => "/bin/true # comment to satisfy puppet syntax requirements apt-get update apt-get install -y extrepo -extrepo enable openstack_antelope +extrepo enable openstack_bobcat apt-get update ", )} @@ -58,14 +58,14 @@ apt-get update end it { should contain_apt__source('debian-openstack-backports').with( - :location => 'http://bullseye-antelope.debian.net/debian', - :release => 'bullseye-antelope-backports', + :location => 'http://bullseye-bobcat.debian.net/debian', + :release => 'bullseye-bobcat-backports', :repos => 'main', )} it { should contain_apt__source('debian-openstack-backports-nochange').with( - :location => 'http://bullseye-antelope.debian.net/debian', - :release => 'bullseye-antelope-backports-nochange', + :location => 'http://bullseye-bobcat.debian.net/debian', + :release => 'bullseye-bobcat-backports-nochange', :repos => 'main' )} diff --git a/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb b/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb index b0dd27a..2be7f59 100644 --- a/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb +++ b/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb @@ -13,7 +13,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do let :paramclass_defaults do { - :release => 'antelope' + :release => 'bobcat' } end @@ -28,7 +28,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do it { should contain_apt__source('ubuntu-cloud-archive').with( :location => 'http://ubuntu-cloud.archive.canonical.com/ubuntu', - :release => 'jammy-updates/antelope', + :release => 'jammy-updates/bobcat', :repos => 'main', )} @@ -127,7 +127,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do it { should contain_apt__source('ubuntu-cloud-archive').with( :location => 'http://mirror.dfw.rax.openstack.org/ubuntu-cloud-archive', - :release => 'jammy-proposed/antelope', + :release => 'jammy-proposed/bobcat', :repos => 'main', )} end diff --git a/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb b/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb index 8a30cd9..6d788d4 100644 --- a/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb +++ b/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb @@ -13,8 +13,8 @@ describe 'openstack_extras::repo::redhat::redhat' do :before => 'Anchor[openstack_extras_redhat]', )} it { should contain_yumrepo('rdo-release').with( - :baseurl => "http://mirror.stream.centos.org/SIGs/$stream/cloud/$basearch/openstack-antelope/", - :descr => "OpenStack Antelope Repository", + :baseurl => "http://mirror.stream.centos.org/SIGs/$stream/cloud/$basearch/openstack-bobcat/", + :descr => "OpenStack Bobcat Repository", :gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud', :enabled => '1', :gpgcheck => '1', @@ -126,7 +126,7 @@ describe 'openstack_extras::repo::redhat::redhat' do end it { should contain_yumrepo('rdo-release').with( - :baseurl => "http://foo.bar/SIGs/$stream/cloud/$basearch/openstack-antelope/", + :baseurl => "http://foo.bar/SIGs/$stream/cloud/$basearch/openstack-bobcat/", )} end