openstack/puppet-openstack_extras
Code Issues Proposed changes

Prepare repos to rocky

Browse Source 
Make default use rocky, just a preparation
to so it's not forgotten when its released.

We still pin version in p-o-i so we should be fine.

Change-Id: Ie687a1386e09a2db86caab57cde938224f79777e
This commit is contained in:
Tobias Urdin 2018-04-09 11:39:11 +02:00
parent 9b63dc312e
commit 6470697839
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@
# [*release*] # [*release*]
# (optional) The OpenStack release to add a # (optional) The OpenStack release to add a
# Debian Stretch apt source for. # Debian Stretch apt source for.
# Defaults to 'queens' # Defaults to $::openstack_extras::repo::debian::params::release
# #
# [*manage_deb*] # [*manage_deb*]
# (optional) Whether or not to add the default # (optional) Whether or not to add the default

2
manifests/repo/debian/params.pp
View File

@ -4,7 +4,7 @@
# #
class openstack_extras::repo::debian::params class openstack_extras::repo::debian::params
{ {
$release = 'queens' $release = 'rocky'
$uca_name = 'ubuntu-cloud-archive' $uca_name = 'ubuntu-cloud-archive'
$uca_location = 'http://ubuntu-cloud.archive.canonical.com/ubuntu' $uca_location = 'http://ubuntu-cloud.archive.canonical.com/ubuntu'

2
manifests/repo/redhat/params.pp
View File

@ -5,7 +5,7 @@
# #
class openstack_extras::repo::redhat::params class openstack_extras::repo::redhat::params
{ {
$release = 'pike' $release = 'rocky'
$repo_defaults = { 'enabled' => '1', $repo_defaults = { 'enabled' => '1',
'gpgcheck' => '1', 'gpgcheck' => '1',

10
spec/classes/openstack_extras_repo_debian_debian_spec.rb
View File

@ -12,7 +12,7 @@ describe 'openstack_extras::repo::debian::debian' do
let :paramclass_defaults do let :paramclass_defaults do
{ {
:release => 'queens' :release => 'rocky'
} }
end end
@ -37,14 +37,14 @@ describe 'openstack_extras::repo::debian::debian' do
end end
it { is_expected.to contain_apt__source('debian-openstack-backports').with( it { is_expected.to contain_apt__source('debian-openstack-backports').with(
:location => 'http://stretch-queens.debian.net/debian', :location => 'http://stretch-rocky.debian.net/debian',
:release => 'stretch-queens-backports', :release => 'stretch-rocky-backports',
:repos => 'main', :repos => 'main',
)} )}
it { is_expected.to contain_apt__source('debian-openstack-backports-nochange').with( it { is_expected.to contain_apt__source('debian-openstack-backports-nochange').with(
:location => 'http://stretch-queens.debian.net/debian', :location => 'http://stretch-rocky.debian.net/debian',
:release => 'stretch-queens-backports-nochange', :release => 'stretch-rocky-backports-nochange',
:repos => 'main' :repos => 'main'
)} )}

6
spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb
View File

@ -12,7 +12,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
let :paramclass_defaults do let :paramclass_defaults do
{ {
:release => 'pike' :release => 'rocky'
} }
end end
@ -38,7 +38,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
it { is_expected.to contain_apt__source('ubuntu-cloud-archive').with( it { is_expected.to contain_apt__source('ubuntu-cloud-archive').with(
:location => 'http://ubuntu-cloud.archive.canonical.com/ubuntu', :location => 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
:release => 'trusty-updates/pike', :release => 'trusty-updates/rocky',
:repos => 'main', :repos => 'main',
)} )}
@ -138,7 +138,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
it { is_expected.to contain_apt__source('ubuntu-cloud-archive').with( it { is_expected.to 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 => 'trusty-proposed/pike', :release => 'trusty-proposed/rocky',
:repos => 'main', :repos => 'main',
)} )}
end end

10
spec/classes/openstack_extras_repo_redhat_redhat_spec.rb
View File

@ -14,7 +14,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
let :paramclass_defaults do let :paramclass_defaults do
{ {
:release => 'pike', :release => 'rocky',
:repo_defaults => { 'enabled' => '1', :repo_defaults => { 'enabled' => '1',
'gpgcheck' => '1', 'gpgcheck' => '1',
'notify' => "Exec[yum_refresh]", 'notify' => "Exec[yum_refresh]",
@ -50,8 +50,8 @@ describe 'openstack_extras::repo::redhat::redhat' do
end end
it { is_expected.to contain_yumrepo('rdo-release').with( it { is_expected.to contain_yumrepo('rdo-release').with(
:baseurl => "http://mirror.centos.org/centos/7/cloud/$basearch/openstack-pike/", :baseurl => "http://mirror.centos.org/centos/7/cloud/$basearch/openstack-rocky/",
:descr => "OpenStack Pike Repository", :descr => "OpenStack Rocky 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',
@ -191,8 +191,8 @@ describe 'openstack_extras::repo::redhat::redhat' do
end end
it { is_expected.to contain_yumrepo('rdo-release').with( it { is_expected.to contain_yumrepo('rdo-release').with(
:baseurl => "http://mirror.dfw.rax.openstack.org/centos/7/cloud/\$basearch/openstack-pike/", :baseurl => "http://mirror.dfw.rax.openstack.org/centos/7/cloud/\$basearch/openstack-rocky/",
:descr => "OpenStack Pike Repository", :descr => "OpenStack Rocky 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",
:proxy => "http://my.proxy.com:8000" :proxy => "http://my.proxy.com:8000"
)} )}