From 63e229456244c5372089b9248c809e1d6ab86b3c Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Tue, 26 Mar 2019 19:30:56 +0100 Subject: [PATCH] Update repos to Train 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 --- manifests/repo/debian/params.pp | 2 +- manifests/repo/redhat/params.pp | 2 +- .../openstack_extras_repo_debian_debian_spec.rb | 10 +++++----- .../openstack_extras_repo_debian_ubuntu_spec.rb | 6 +++--- .../openstack_extras_repo_redhat_redhat_spec.rb | 10 +++++----- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/manifests/repo/debian/params.pp b/manifests/repo/debian/params.pp index 34d996b..8cab656 100644 --- a/manifests/repo/debian/params.pp +++ b/manifests/repo/debian/params.pp @@ -4,7 +4,7 @@ # class openstack_extras::repo::debian::params { - $release = 'stein' + $release = 'train' $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 17410ff..b25a172 100644 --- a/manifests/repo/redhat/params.pp +++ b/manifests/repo/redhat/params.pp @@ -5,7 +5,7 @@ # class openstack_extras::repo::redhat::params { - $release = 'stein' + $release = 'train' $repo_defaults = { 'enabled' => '1', 'gpgcheck' => '1', diff --git a/spec/classes/openstack_extras_repo_debian_debian_spec.rb b/spec/classes/openstack_extras_repo_debian_debian_spec.rb index c564cd6..85c262a 100644 --- a/spec/classes/openstack_extras_repo_debian_debian_spec.rb +++ b/spec/classes/openstack_extras_repo_debian_debian_spec.rb @@ -13,7 +13,7 @@ describe 'openstack_extras::repo::debian::debian' do let :paramclass_defaults do { - :release => 'stein' + :release => 'train' } end @@ -27,14 +27,14 @@ describe 'openstack_extras::repo::debian::debian' do end it { should contain_apt__source('debian-openstack-backports').with( - :location => 'http://stretch-stein.debian.net/debian', - :release => 'stretch-stein-backports', + :location => 'http://stretch-train.debian.net/debian', + :release => 'stretch-train-backports', :repos => 'main', )} it { should contain_apt__source('debian-openstack-backports-nochange').with( - :location => 'http://stretch-stein.debian.net/debian', - :release => 'stretch-stein-backports-nochange', + :location => 'http://stretch-train.debian.net/debian', + :release => 'stretch-train-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 4a6c839..1ebb4e1 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 => 'stein' + :release => 'train' } 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 => 'trusty-updates/stein', + :release => 'trusty-updates/train', :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 => 'trusty-proposed/stein', + :release => 'trusty-proposed/train', :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 5fbe76a..391d408 100644 --- a/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb +++ b/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb @@ -15,7 +15,7 @@ describe 'openstack_extras::repo::redhat::redhat' do let :paramclass_defaults do { - :release => 'stein', + :release => 'train', :repo_defaults => { 'enabled' => '1', 'gpgcheck' => '1', 'notify' => 'Exec[yum_refresh]', @@ -40,8 +40,8 @@ describe 'openstack_extras::repo::redhat::redhat' do end it { should contain_yumrepo('rdo-release').with( - :baseurl => "http://mirror.centos.org/centos/7/cloud/$basearch/openstack-stein/", - :descr => 'OpenStack Stein Repository', + :baseurl => "http://mirror.centos.org/centos/7/cloud/$basearch/openstack-train/", + :descr => 'OpenStack Train Repository', :gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud', :enabled => '1', :gpgcheck => '1', @@ -180,8 +180,8 @@ describe 'openstack_extras::repo::redhat::redhat' do end it { should contain_yumrepo('rdo-release').with( - :baseurl => "http://mirror.dfw.rax.openstack.org/centos/7/cloud/\$basearch/openstack-stein/", - :descr => 'OpenStack Stein Repository', + :baseurl => "http://mirror.dfw.rax.openstack.org/centos/7/cloud/\$basearch/openstack-train/", + :descr => 'OpenStack Train Repository', :gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud', :proxy => 'http://my.proxy.com:8000' )}