openstack/puppet-openstack_extras
Code Issues Proposed changes

Bump default release to Ocata

Browse Source 
Bump default releases of repos from newton to ocata.

Change-Id: Id0b0aa2d5c17740d92976cdfe41b2b213ced1cd6
This commit is contained in:
Emilien Macchi 2017-01-24 21:20:02 -05:00
parent f5258073be
commit 46525780e9
5 changed files with 13 additions and 13 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 = 'newton' $release = 'ocata'
$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 = 'newton' $release = 'ocata'
$repo_defaults = { 'enabled' => '1', $repo_defaults = { 'enabled' => '1',
'gpgcheck' => '1', 'gpgcheck' => '1',

6
spec/classes/openstack_extras_repo_debian_debian_spec.rb
View File

@ -12,7 +12,7 @@ describe 'openstack_extras::repo::debian::debian' do
let :paramclass_defaults do let :paramclass_defaults do
{ {
:release => 'newton' :release => 'ocata'
} }
end end
@ -37,13 +37,13 @@ describe 'openstack_extras::repo::debian::debian' do
it { is_expected.to contain_apt__source('debian_wheezy').with( it { is_expected.to contain_apt__source('debian_wheezy').with(
:location => 'http://archive.gplhost.com/debian', :location => 'http://archive.gplhost.com/debian',
:release => 'newton', :release => 'ocata',
:repos => 'main', :repos => 'main',
)} )}
it { is_expected.to contain_apt__source('debian_wheezy_backports').with( it { is_expected.to contain_apt__source('debian_wheezy_backports').with(
:location => 'http://archive.gplhost.com/debian', :location => 'http://archive.gplhost.com/debian',
:release => 'newton-backports', :release => 'ocata-backports',
:repos => 'main' :repos => 'main'
)} )}

6
spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb
View File

@ -12,7 +12,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
let :paramclass_defaults do let :paramclass_defaults do
{ {
:release => 'newton' :release => 'ocata'
} }
end end
@ -38,7 +38,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
it { is_expected.to contain_apt__source('ubuntu-cloud-archive').with( it { is_expected.to 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/newton', :release => 'trusty-updates/ocata',
:repos => 'main', :repos => 'main',
)} )}
@ -138,7 +138,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
it { is_expected.to contain_apt__source('ubuntu-cloud-archive').with( it { is_expected.to 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/newton', :release => 'trusty-proposed/ocata',
:repos => 'main', :repos => 'main',
)} )}
end end

10
spec/classes/openstack_extras_repo_redhat_redhat_spec.rb
View File

@ -14,7 +14,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
let :paramclass_defaults do let :paramclass_defaults do
{ {
:release => 'newton', :release => 'ocata',
:repo_defaults => { 'enabled' => '1', :repo_defaults => { 'enabled' => '1',
'gpgcheck' => '1', 'gpgcheck' => '1',
'notify' => "Exec[yum_refresh]", 'notify' => "Exec[yum_refresh]",
@ -50,8 +50,8 @@ describe 'openstack_extras::repo::redhat::redhat' do
end end
it { is_expected.to contain_yumrepo('rdo-release').with( it { is_expected.to contain_yumrepo('rdo-release').with(
:baseurl => "http://mirror.centos.org/centos/7/cloud/$basearch/openstack-newton/", :baseurl => "http://mirror.centos.org/centos/7/cloud/$basearch/openstack-ocata/",
:descr => "OpenStack Newton Repository", :descr => "OpenStack Ocata 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',
@ -191,8 +191,8 @@ describe 'openstack_extras::repo::redhat::redhat' do
end end
it { is_expected.to contain_yumrepo('rdo-release').with( it { is_expected.to contain_yumrepo('rdo-release').with(
:baseurl => "http://mirror.dfw.rax.openstack.org/centos/7/cloud/\$basearch/openstack-newton/", :baseurl => "http://mirror.dfw.rax.openstack.org/centos/7/cloud/\$basearch/openstack-ocata/",
:descr => "OpenStack Newton Repository", :descr => "OpenStack Ocata 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"
)} )}