Merge "Switch to Victoria"

This commit is contained in:
Zuul 2020-12-04 08:46:59 +00:00 committed by Gerrit Code Review
commit 14d8364f10
5 changed files with 15 additions and 15 deletions

View File

@ -4,7 +4,7 @@
# #
class openstack_extras::repo::debian::params class openstack_extras::repo::debian::params
{ {
$release = 'ussuri' $release = 'victoria'
$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'

View File

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

View File

@ -13,7 +13,7 @@ describe 'openstack_extras::repo::debian::debian' do
let :paramclass_defaults do let :paramclass_defaults do
{ {
:release => 'ussuri' :release => 'victoria'
} }
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-ussuri.debian.net/debian', :location => 'http://stretch-victoria.debian.net/debian',
:release => 'stretch-ussuri-backports', :release => 'stretch-victoria-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-ussuri.debian.net/debian', :location => 'http://stretch-victoria.debian.net/debian',
:release => 'stretch-ussuri-backports-nochange', :release => 'stretch-victoria-backports-nochange',
:repos => 'main' :repos => 'main'
)} )}

View File

@ -13,7 +13,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
let :paramclass_defaults do let :paramclass_defaults do
{ {
:release => 'ussuri' :release => 'victoria'
} }
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/ussuri', :release => 'trusty-updates/victoria',
: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/ussuri', :release => 'trusty-proposed/victoria',
:repos => 'main', :repos => 'main',
)} )}
end end

View File

@ -15,7 +15,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
let :paramclass_defaults do let :paramclass_defaults do
{ {
:release => 'train', :release => 'victoria',
: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-ussuri/", :baseurl => "http://mirror.centos.org/centos/7/cloud/$basearch/openstack-victoria/",
:descr => 'OpenStack Ussuri Repository', :descr => 'OpenStack Victoria 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',
@ -183,8 +183,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-train/", :baseurl => "http://mirror.dfw.rax.openstack.org/centos/7/cloud/\$basearch/openstack-victoria/",
:descr => 'OpenStack Train Repository', :descr => 'OpenStack Victoria 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'
)} )}