acceptance: bump to Liberty release
Upgrade acceptance manifest from Kilo (stable) to Liberty (dev) on both Ubuntu Trusty & Centos7. Change-Id: I9e2da19afa5ed5d88715e7c91ee7d667886b9637 Co-Authored-By: Lukas Bezdicka <lbezdick@redhat.com> Depends-On: I7c1f31b3cc4c6ea1f894a263a8cff60e357accb8
This commit is contained in:
parent
8b8723d1b6
commit
c91884124b
@ -12,14 +12,28 @@ describe 'glance class' do
|
|||||||
case $::osfamily {
|
case $::osfamily {
|
||||||
'Debian': {
|
'Debian': {
|
||||||
include ::apt
|
include ::apt
|
||||||
class { '::openstack_extras::repo::debian::ubuntu':
|
apt::ppa { 'ppa:ubuntu-cloud-archive/liberty-staging':
|
||||||
release => 'kilo',
|
# it's false by default in 2.x series but true in 1.8.x
|
||||||
package_require => true,
|
package_manage => false,
|
||||||
}
|
}
|
||||||
|
Exec['apt_update'] -> Package<||>
|
||||||
}
|
}
|
||||||
'RedHat': {
|
'RedHat': {
|
||||||
class { '::openstack_extras::repo::redhat::redhat':
|
class { '::openstack_extras::repo::redhat::redhat':
|
||||||
release => 'kilo',
|
manage_rdo => false,
|
||||||
|
repo_hash => {
|
||||||
|
# we need kilo repo to be installed for dependencies
|
||||||
|
'rdo-kilo' => {
|
||||||
|
'baseurl' => 'https://repos.fedorapeople.org/repos/openstack/openstack-kilo/el7/',
|
||||||
|
'descr' => 'RDO kilo',
|
||||||
|
'gpgcheck' => 'no',
|
||||||
|
},
|
||||||
|
'rdo-liberty' => {
|
||||||
|
'baseurl' => 'http://trunk.rdoproject.org/centos7/current/',
|
||||||
|
'descr' => 'RDO trunk',
|
||||||
|
'gpgcheck' => 'no',
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
package { 'openstack-selinux': ensure => 'latest' }
|
package { 'openstack-selinux': ensure => 'latest' }
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user