Browse Source

Switch to Victoria

... because Victoria has already been released.

Change-Id: I36e4872ea726808be9580c2818028053c23dba18
(cherry picked from commit b35d3c3015)
changes/06/765406/1
Takashi Kajinami 10 months ago
parent
commit
259b755a75
  1. 2
      manifests/repo/debian/params.pp
  2. 2
      manifests/repo/redhat/params.pp
  3. 10
      spec/classes/openstack_extras_repo_debian_debian_spec.rb
  4. 6
      spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb
  5. 10
      spec/classes/openstack_extras_repo_redhat_redhat_spec.rb

2
manifests/repo/debian/params.pp

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

2
manifests/repo/redhat/params.pp

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

10
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 => 'ussuri'
:release => 'victoria'
}
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-ussuri.debian.net/debian',
:release => 'stretch-ussuri-backports',
:location => 'http://stretch-victoria.debian.net/debian',
:release => 'stretch-victoria-backports',
:repos => 'main',
)}
it { should contain_apt__source('debian-openstack-backports-nochange').with(
:location => 'http://stretch-ussuri.debian.net/debian',
:release => 'stretch-ussuri-backports-nochange',
:location => 'http://stretch-victoria.debian.net/debian',
:release => 'stretch-victoria-backports-nochange',
:repos => 'main'
)}

6
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 => 'ussuri'
:release => 'victoria'
}
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/ussuri',
:release => 'trusty-updates/victoria',
: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/ussuri',
:release => 'trusty-proposed/victoria',
:repos => 'main',
)}
end

10
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 => 'train',
:release => 'victoria',
: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-ussuri/",
:descr => 'OpenStack Ussuri Repository',
:baseurl => "http://mirror.centos.org/centos/7/cloud/$basearch/openstack-victoria/",
:descr => 'OpenStack Victoria Repository',
:gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud',
:enabled => '1',
:gpgcheck => '1',
@ -183,8 +183,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-train/",
:descr => 'OpenStack Train Repository',
:baseurl => "http://mirror.dfw.rax.openstack.org/centos/7/cloud/\$basearch/openstack-victoria/",
:descr => 'OpenStack Victoria Repository',
:gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud',
:proxy => 'http://my.proxy.com:8000'
)}

Loading…
Cancel
Save