Switch to Dalmatian
To parepare a new module release for Dalmatian, update the default release name accordingly. Change-Id: I8c1121d1ba4628b66ac22da0fd05b28246a5cdf6
This commit is contained in:
parent
6f83f16042
commit
39c9d1c23b
@ -8,7 +8,7 @@
|
|||||||
# [*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 'caracal'
|
# Defaults to 'dalmatian'
|
||||||
#
|
#
|
||||||
# [*manage_deb*]
|
# [*manage_deb*]
|
||||||
# (optional) Whether or not to add the default
|
# (optional) Whether or not to add the default
|
||||||
@ -41,7 +41,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 = 'caracal',
|
String[1] $release = 'dalmatian',
|
||||||
Boolean $manage_deb = true,
|
Boolean $manage_deb = true,
|
||||||
Boolean $package_require = false,
|
Boolean $package_require = false,
|
||||||
Boolean $use_extrepo = true,
|
Boolean $use_extrepo = true,
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
# [*release*]
|
# [*release*]
|
||||||
# (optional) The OpenStack release to add an
|
# (optional) The OpenStack release to add an
|
||||||
# Ubuntu Cloud Archive APT source for.
|
# Ubuntu Cloud Archive APT source for.
|
||||||
# Defaults to 'caracal'
|
# Defaults to 'dalmatian'
|
||||||
#
|
#
|
||||||
# [*manage_uca*]
|
# [*manage_uca*]
|
||||||
# (optional) Whether or not to add the default
|
# (optional) Whether or not to add the default
|
||||||
@ -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 = 'caracal',
|
String[1] $release = 'dalmatian',
|
||||||
Boolean $manage_uca = true,
|
Boolean $manage_uca = true,
|
||||||
Enum['updates', 'proposed'] $repo = 'updates',
|
Enum['updates', 'proposed'] $repo = 'updates',
|
||||||
Hash $source_hash = {},
|
Hash $source_hash = {},
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
#
|
#
|
||||||
# [*release*]
|
# [*release*]
|
||||||
# (Optional) The OpenStack release to use.
|
# (Optional) The OpenStack release to use.
|
||||||
# Defaults to 'caracal'
|
# Defaults to 'dalmatian'
|
||||||
#
|
#
|
||||||
# [*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 = 'caracal',
|
String[1] $release = 'dalmatian',
|
||||||
Boolean $manage_rdo = true,
|
Boolean $manage_rdo = true,
|
||||||
Hash $repo_hash = {},
|
Hash $repo_hash = {},
|
||||||
Hash $repo_source_hash = {},
|
Hash $repo_source_hash = {},
|
||||||
|
@ -14,7 +14,7 @@ describe 'openstack_extras::repo::debian::debian' do
|
|||||||
|
|
||||||
let :paramclass_defaults do
|
let :paramclass_defaults do
|
||||||
{
|
{
|
||||||
:release => 'caracal'
|
:release => 'dalmatian'
|
||||||
}
|
}
|
||||||
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_caracal').with(
|
it { should contain_exec('/usr/bin/extrepo enable openstack_dalmatian').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_caracal
|
extrepo enable openstack_dalmatian
|
||||||
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']}-caracal.debian.net/debian",
|
:location => "http://#{facts[:os]['distro']['codename']}-dalmatian.debian.net/debian",
|
||||||
:release => "#{facts[:os]['distro']['codename']}-caracal-backports",
|
:release => "#{facts[:os]['distro']['codename']}-dalmatian-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']}-caracal.debian.net/debian",
|
:location => "http://#{facts[:os]['distro']['codename']}-dalmatian.debian.net/debian",
|
||||||
:release => "#{facts[:os]['distro']['codename']}-caracal-backports-nochange",
|
:release => "#{facts[:os]['distro']['codename']}-dalmatian-backports-nochange",
|
||||||
:repos => 'main'
|
:repos => 'main'
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
|
|||||||
|
|
||||||
let :paramclass_defaults do
|
let :paramclass_defaults do
|
||||||
{
|
{
|
||||||
:release => 'caracal'
|
:release => 'dalmatian'
|
||||||
}
|
}
|
||||||
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/caracal",
|
:release => "#{facts[:os]['distro']['codename']}-updates/dalmatian",
|
||||||
: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/caracal",
|
:release => "#{facts[:os]['distro']['codename']}-proposed/dalmatian",
|
||||||
:repos => 'main',
|
:repos => 'main',
|
||||||
)}
|
)}
|
||||||
end
|
end
|
||||||
|
@ -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-caracal/",
|
:baseurl => "http://mirror.stream.centos.org/SIGs/$stream/cloud/$basearch/openstack-dalmatian/",
|
||||||
:descr => "OpenStack Caracal Repository",
|
:descr => "OpenStack Dalmatian 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-caracal/",
|
:baseurl => "http://foo.bar/SIGs/$stream/cloud/$basearch/openstack-dalmatian/",
|
||||||
)}
|
)}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user