openstack/puppet-openstack_extras
Code Issues Proposed changes

Switch to Epoxy

Browse Source 
This is a prep work to create Epoxy release and update the default
release version from Dalmatian to Epoxy.

Change-Id: Id7704630f1344f9c8b36f205e7cfa9eabe853340
This commit is contained in:
Takashi Kajinami
2025-04-06 22:36:02 +09:00
parent bcdbaf304c
commit 032e714fb2
6 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/repo/debian/debian.pp
View File

@@ -6,13 +6,11 @@
# === Parameters: # === Parameters:
# #
# [*release*] # [*release*]
# (optional) The OpenStack release to add a # (optional) The OpenStack release to add a Debian apt source for.
# Debian apt source for. # Defaults to 'epoxy'
# Defaults to 'dalmatian'
# #
# [*manage_deb*] # [*manage_deb*]
# (optional) Whether or not to add the default # (optional) Whether or not to add the default Debian APT source
# Debian APT source
# Defaults to true # Defaults to true
# #
# [*package_require*] # [*package_require*]
@@ -41,7 +39,7 @@
# Defaults to "http://${facts['os']['distro']['codename']}-${release}.debian.net/debian" # Defaults to "http://${facts['os']['distro']['codename']}-${release}.debian.net/debian"
# #
class openstack_extras::repo::debian::debian( class openstack_extras::repo::debian::debian(
String[1] $release = 'dalmatian', String[1] $release = 'epoxy',
Boolean $manage_deb = true, Boolean $manage_deb = true,
Boolean $package_require = false, Boolean $package_require = false,
Boolean $use_extrepo = true, Boolean $use_extrepo = true,

12
manifests/repo/debian/ubuntu.pp
View File

@@ -6,13 +6,13 @@
# === Parameters: # === Parameters:
# #
# [*release*] # [*release*]
# (optional) The OpenStack release to add an # (optional) The OpenStack release to add an Ubuntu Cloud Archive APT source
# Ubuntu Cloud Archive APT source for. # for.
# Defaults to 'dalmatian' # Defaults to 'epoxy'
# #
# [*manage_uca*] # [*manage_uca*]
# (optional) Whether or not to add the default # (optional) Whether or not to add the default Ubuntu Cloud Archive APT
# Ubuntu Cloud Archive APT source # source.
# Defaults to true # Defaults to true
# #
# [*repo*] # [*repo*]
@@ -42,7 +42,7 @@
# Defaults to $::openstack_extras::repo::debian::params::uca_location # Defaults to $::openstack_extras::repo::debian::params::uca_location
# #
class openstack_extras::repo::debian::ubuntu( class openstack_extras::repo::debian::ubuntu(
String[1] $release = 'dalmatian', String[1] $release = 'epoxy',
Boolean $manage_uca = true, Boolean $manage_uca = true,
Enum['updates', 'proposed'] $repo = 'updates', Enum['updates', 'proposed'] $repo = 'updates',
Hash $source_hash = {}, Hash $source_hash = {},

4
manifests/repo/redhat/redhat.pp
View File

@@ -7,7 +7,7 @@
# #
# [*release*] # [*release*]
# (Optional) The OpenStack release to use. # (Optional) The OpenStack release to use.
# Defaults to 'dalmatian' # Defaults to 'epoxy'
# #
# [*manage_rdo*] # [*manage_rdo*]
# (Optional) Whether to create a yumrepo resource for the # (Optional) Whether to create a yumrepo resource for the
@@ -72,7 +72,7 @@
# Defaults to false # Defaults to false
# #
class openstack_extras::repo::redhat::redhat ( class openstack_extras::repo::redhat::redhat (
String[1] $release = 'dalmatian', String[1] $release = 'epoxy',
Boolean $manage_rdo = true, Boolean $manage_rdo = true,
Hash $repo_hash = {}, Hash $repo_hash = {},
Hash $repo_source_hash = {}, Hash $repo_source_hash = {},

14
spec/classes/openstack_extras_repo_debian_debian_spec.rb
View File

@@ -14,7 +14,7 @@ describe 'openstack_extras::repo::debian::debian' do
let :paramclass_defaults do let :paramclass_defaults do
{ {
:release => 'dalmatian' :release => 'epoxy'
} }
end end
@@ -23,11 +23,11 @@ describe 'openstack_extras::repo::debian::debian' do
end end
context 'with default params' do context 'with default params' do
it { should contain_exec('/usr/bin/extrepo enable openstack_dalmatian').with( it { should contain_exec('/usr/bin/extrepo enable openstack_epoxy').with(
:command => "/bin/true # comment to satisfy puppet syntax requirements :command => "/bin/true # comment to satisfy puppet syntax requirements
apt-get update apt-get update
apt-get install -y extrepo apt-get install -y extrepo
extrepo enable openstack_dalmatian extrepo enable openstack_epoxy
apt-get update apt-get update
", ",
)} )}
@@ -58,14 +58,14 @@ apt-get update
end end
it { should contain_apt__source('debian-openstack-backports').with( it { should contain_apt__source('debian-openstack-backports').with(
:location => "http://#{facts[:os]['distro']['codename']}-dalmatian.debian.net/debian", :location => "http://#{facts[:os]['distro']['codename']}-epoxy.debian.net/debian",
:release => "#{facts[:os]['distro']['codename']}-dalmatian-backports", :release => "#{facts[:os]['distro']['codename']}-epoxy-backports",
:repos => 'main', :repos => 'main',
)} )}
it { should contain_apt__source('debian-openstack-backports-nochange').with( it { should contain_apt__source('debian-openstack-backports-nochange').with(
:location => "http://#{facts[:os]['distro']['codename']}-dalmatian.debian.net/debian", :location => "http://#{facts[:os]['distro']['codename']}-epoxy.debian.net/debian",
:release => "#{facts[:os]['distro']['codename']}-dalmatian-backports-nochange", :release => "#{facts[:os]['distro']['codename']}-epoxy-backports-nochange",
:repos => 'main' :repos => 'main'
)} )}

6
spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb
View File

@@ -13,7 +13,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
let :paramclass_defaults do let :paramclass_defaults do
{ {
:release => 'dalmatian' :release => 'epoxy'
} }
end end
@@ -28,7 +28,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
it { should contain_apt__source('ubuntu-cloud-archive').with( it { should contain_apt__source('ubuntu-cloud-archive').with(
:location => 'http://ubuntu-cloud.archive.canonical.com/ubuntu', :location => 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
:release => "#{facts[:os]['distro']['codename']}-updates/dalmatian", :release => "#{facts[:os]['distro']['codename']}-updates/epoxy",
:repos => 'main', :repos => 'main',
)} )}
@@ -130,7 +130,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
it { should contain_apt__source('ubuntu-cloud-archive').with( it { should contain_apt__source('ubuntu-cloud-archive').with(
:location => 'http://mirror.dfw.rax.openstack.org/ubuntu-cloud-archive', :location => 'http://mirror.dfw.rax.openstack.org/ubuntu-cloud-archive',
:release => "#{facts[:os]['distro']['codename']}-proposed/dalmatian", :release => "#{facts[:os]['distro']['codename']}-proposed/epoxy",
:repos => 'main', :repos => 'main',
)} )}
end end

6
spec/classes/openstack_extras_repo_redhat_redhat_spec.rb
View File

@@ -13,8 +13,8 @@ describe 'openstack_extras::repo::redhat::redhat' do
:before => 'Anchor[openstack_extras_redhat]', :before => 'Anchor[openstack_extras_redhat]',
)} )}
it { should contain_yumrepo('rdo-release').with( it { should contain_yumrepo('rdo-release').with(
:baseurl => "http://mirror.stream.centos.org/SIGs/$stream/cloud/$basearch/openstack-dalmatian/", :baseurl => "http://mirror.stream.centos.org/SIGs/$stream/cloud/$basearch/openstack-epoxy/",
:descr => "OpenStack Dalmatian Repository", :descr => "OpenStack Epoxy Repository",
:gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud', :gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud',
:enabled => '1', :enabled => '1',
:gpgcheck => '1', :gpgcheck => '1',
@@ -126,7 +126,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
end end
it { should contain_yumrepo('rdo-release').with( it { should contain_yumrepo('rdo-release').with(
:baseurl => "http://foo.bar/SIGs/$stream/cloud/$basearch/openstack-dalmatian/", :baseurl => "http://foo.bar/SIGs/$stream/cloud/$basearch/openstack-epoxy/",
)} )}
end end