acceptance: bump to Liberty release

Upgrade acceptance manifest from Kilo (stable) to Liberty (dev)
on both Ubuntu Trusty & Centos7.

Change-Id: I981aad948f7ba5848781c2162820741330b68df8
Co-Authored-By: Lukas Bezdicka <lbezdick@redhat.com>
Depends-On: I7c1f31b3cc4c6ea1f894a263a8cff60e357accb8
This commit is contained in:
Emilien Macchi
2015-08-04 20:33:11 -04:00
parent 0c5aa925ce
commit f859bb3a30

View File

@@ -12,15 +12,29 @@ describe 'basic nova' 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<||>
$package_provider = 'apt' $package_provider = 'apt'
} }
'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' }
$package_provider = 'yum' $package_provider = 'yum'