openstack/puppet-openstack_extras
Code Issues Proposed changes

Update repos to Train

Browse Source 
Make sure to change these early so that we don't
forget them when releasing next release.

We are overriding these in testing so they don't
cause any troubles.

Change-Id: Iade37928e9875019c6fbf89827abaab9ec7831b3
This commit is contained in:
Tobias Urdin 2019-03-26 19:30:56 +01:00
parent 699910cdf9
commit 63e2294562
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 = 'stein' $release = 'train'
$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 = 'stein' $release = 'train'
$repo_defaults = { 'enabled' => '1', $repo_defaults = { 'enabled' => '1',
'gpgcheck' => '1', 'gpgcheck' => '1',

10
spec/classes/openstack_extras_repo_debian_debian_spec.rb
View File

@ -13,7 +13,7 @@ describe 'openstack_extras::repo::debian::debian' do
let :paramclass_defaults do let :paramclass_defaults do
{ {
:release => 'stein' :release => 'train'
} }
end end
@ -27,14 +27,14 @@ describe 'openstack_extras::repo::debian::debian' do
end end
it { should contain_apt__source('debian-openstack-backports').with( it { should contain_apt__source('debian-openstack-backports').with(
:location => 'http://stretch-stein.debian.net/debian', :location => 'http://stretch-train.debian.net/debian',
:release => 'stretch-stein-backports', :release => 'stretch-train-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://stretch-stein.debian.net/debian', :location => 'http://stretch-train.debian.net/debian',
:release => 'stretch-stein-backports-nochange', :release => 'stretch-train-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 => 'stein' :release => 'train'
} }
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 => 'trusty-updates/stein', :release => 'trusty-updates/train',
:repos => 'main', :repos => 'main',
)} )}
@ -127,7 +127,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 => 'trusty-proposed/stein', :release => 'trusty-proposed/train',
:repos => 'main', :repos => 'main',
)} )}
end end

10
spec/classes/openstack_extras_repo_redhat_redhat_spec.rb
View File

@ -15,7 +15,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
let :paramclass_defaults do let :paramclass_defaults do
{ {
:release => 'stein', :release => 'train',
:repo_defaults => { 'enabled' => '1', :repo_defaults => { 'enabled' => '1',
'gpgcheck' => '1', 'gpgcheck' => '1',
'notify' => 'Exec[yum_refresh]', 'notify' => 'Exec[yum_refresh]',
@ -40,8 +40,8 @@ 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://mirror.centos.org/centos/7/cloud/$basearch/openstack-stein/", :baseurl => "http://mirror.centos.org/centos/7/cloud/$basearch/openstack-train/",
:descr => 'OpenStack Stein Repository', :descr => 'OpenStack Train 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',
@ -180,8 +180,8 @@ 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://mirror.dfw.rax.openstack.org/centos/7/cloud/\$basearch/openstack-stein/", :baseurl => "http://mirror.dfw.rax.openstack.org/centos/7/cloud/\$basearch/openstack-train/",
:descr => 'OpenStack Stein Repository', :descr => 'OpenStack Train 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'
)} )}