bump to mitaka
In openstack_extras_repo_spec, we hardcode the version of the release. It was liberty, it's now mitaka since our recent CI bump. Change-Id: I90b6f0bbeb76c870f0ab26cf0ff9bdcbb0cb5ca8 Partial-Bug: #1535382
This commit is contained in:
parent
950a90ab7a
commit
3626baf4a3
manifests/repo
spec
@ -4,7 +4,7 @@
|
||||
#
|
||||
class openstack_extras::repo::debian::params
|
||||
{
|
||||
$release = 'liberty'
|
||||
$release = 'mitaka'
|
||||
|
||||
$uca_name = 'ubuntu-cloud-archive'
|
||||
$uca_location = 'http://ubuntu-cloud.archive.canonical.com/ubuntu'
|
||||
|
@ -5,7 +5,7 @@
|
||||
#
|
||||
class openstack_extras::repo::redhat::params
|
||||
{
|
||||
$release = 'liberty'
|
||||
$release = 'mitaka'
|
||||
|
||||
$repo_defaults = { 'enabled' => '1',
|
||||
'gpgcheck' => '1',
|
||||
|
@ -4,7 +4,7 @@ describe 'openstack_extras::repo::*' do
|
||||
|
||||
context 'default parameters' do
|
||||
|
||||
release = 'liberty'
|
||||
release = 'mitaka'
|
||||
it 'should work with no errors' do
|
||||
pp= <<-EOS
|
||||
include ::openstack_integration
|
||||
|
@ -12,7 +12,7 @@ describe 'openstack_extras::repo::debian::debian' do
|
||||
|
||||
let :paramclass_defaults do
|
||||
{
|
||||
:release => 'liberty'
|
||||
:release => 'mitaka'
|
||||
}
|
||||
end
|
||||
|
||||
@ -36,13 +36,13 @@ describe 'openstack_extras::repo::debian::debian' do
|
||||
|
||||
it { is_expected.to contain_apt__source('debian_wheezy').with(
|
||||
:location => 'http://archive.gplhost.com/debian',
|
||||
:release => 'liberty',
|
||||
:release => 'mitaka',
|
||||
:repos => 'main',
|
||||
)}
|
||||
|
||||
it { is_expected.to contain_apt__source('debian_wheezy_backports').with(
|
||||
:location => 'http://archive.gplhost.com/debian',
|
||||
:release => 'liberty-backports',
|
||||
:release => 'mitaka-backports',
|
||||
:repos => 'main'
|
||||
)}
|
||||
|
||||
|
@ -12,7 +12,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
|
||||
|
||||
let :paramclass_defaults do
|
||||
{
|
||||
:release => 'liberty'
|
||||
:release => 'mitaka'
|
||||
}
|
||||
end
|
||||
|
||||
@ -37,7 +37,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
|
||||
|
||||
it { is_expected.to contain_apt__source('ubuntu-cloud-archive').with(
|
||||
:location => 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
|
||||
:release => 'trusty-updates/liberty',
|
||||
:release => 'trusty-updates/mitaka',
|
||||
:repos => 'main',
|
||||
)}
|
||||
|
||||
@ -136,7 +136,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
|
||||
|
||||
it { is_expected.to contain_apt__source('ubuntu-cloud-archive').with(
|
||||
:location => 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
|
||||
:release => 'trusty-proposed/liberty',
|
||||
:release => 'trusty-proposed/mitaka',
|
||||
:repos => 'main',
|
||||
)}
|
||||
end
|
||||
|
@ -14,7 +14,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
|
||||
|
||||
let :paramclass_defaults do
|
||||
{
|
||||
:release => 'liberty',
|
||||
:release => 'mitaka',
|
||||
:repo_defaults => { 'enabled' => '1',
|
||||
'gpgcheck' => '1',
|
||||
'notify' => "Exec[yum_refresh]",
|
||||
@ -50,8 +50,8 @@ describe 'openstack_extras::repo::redhat::redhat' do
|
||||
end
|
||||
|
||||
it { is_expected.to contain_yumrepo('rdo-release').with(
|
||||
:baseurl => "http://mirror.centos.org/centos/7/cloud/$basearch/openstack-liberty/",
|
||||
:descr => "OpenStack Liberty Repository",
|
||||
:baseurl => "http://mirror.centos.org/centos/7/cloud/$basearch/openstack-mitaka/",
|
||||
:descr => "OpenStack Mitaka Repository",
|
||||
:priority => 98,
|
||||
:gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud",
|
||||
:enabled => '1',
|
||||
@ -164,8 +164,8 @@ describe 'openstack_extras::repo::redhat::redhat' do
|
||||
end
|
||||
|
||||
it { is_expected.to contain_yumrepo('rdo-release').with(
|
||||
:baseurl => "http://mirror.centos.org/centos/7/cloud/\$basearch/openstack-liberty/",
|
||||
:descr => "OpenStack Liberty Repository",
|
||||
:baseurl => "http://mirror.centos.org/centos/7/cloud/\$basearch/openstack-mitaka/",
|
||||
:descr => "OpenStack Mitaka Repository",
|
||||
:gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud",
|
||||
:proxy => "http://my.proxy.com:8000"
|
||||
)}
|
||||
|
Loading…
x
Reference in New Issue
Block a user