diff --git a/manifests/repo/debian/params.pp b/manifests/repo/debian/params.pp index 0ecc507..b44a8ed 100644 --- a/manifests/repo/debian/params.pp +++ b/manifests/repo/debian/params.pp @@ -4,7 +4,7 @@ # class openstack_extras::repo::debian::params { - $release = 'victoria' + $release = 'wallaby' $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 fd20eda..8fd94c5 100644 --- a/manifests/repo/redhat/params.pp +++ b/manifests/repo/redhat/params.pp @@ -5,7 +5,7 @@ # class openstack_extras::repo::redhat::params { - $release = 'victoria' + $release = 'wallaby' $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 f5c7ec1..37d304f 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 => 'victoria' + :release => 'wallaby' } 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-victoria.debian.net/debian', - :release => 'stretch-victoria-backports', + :location => 'http://stretch-wallaby.debian.net/debian', + :release => 'stretch-wallaby-backports', :repos => 'main', )} it { should contain_apt__source('debian-openstack-backports-nochange').with( - :location => 'http://stretch-victoria.debian.net/debian', - :release => 'stretch-victoria-backports-nochange', + :location => 'http://stretch-wallaby.debian.net/debian', + :release => 'stretch-wallaby-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 c3db200..ca1e84e 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 => 'victoria' + :release => 'wallaby' } 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/victoria', + :release => 'trusty-updates/wallaby', :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/victoria', + :release => 'trusty-proposed/wallaby', :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 60a556b..1383d48 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 => 'victoria', + :release => 'wallaby', :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-victoria/", - :descr => 'OpenStack Victoria Repository', + :baseurl => "http://mirror.centos.org/centos/7/cloud/$basearch/openstack-wallaby/", + :descr => 'OpenStack Wallaby Repository', :gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud', :enabled => '1', :gpgcheck => '1', @@ -127,7 +127,7 @@ describe 'openstack_extras::repo::redhat::redhat' do end it { should contain_yumrepo('rdo-release').with( - :baseurl => "http://mirror.centos.org/centos/8-stream/cloud/$basearch/openstack-victoria/", + :baseurl => "http://mirror.centos.org/centos/8-stream/cloud/$basearch/openstack-wallaby/", )} it { should contain_yumrepo('rdo-qemu-ev').with( @@ -201,8 +201,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-victoria/", - :descr => 'OpenStack Victoria Repository', + :baseurl => "http://mirror.dfw.rax.openstack.org/centos/7/cloud/\$basearch/openstack-wallaby/", + :descr => 'OpenStack Wallaby Repository', :gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud', :proxy => 'http://my.proxy.com:8000' )}