From 3dbe940b19d9541b1964f9cba62d1f4369590b99 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 4 Aug 2015 20:23:59 -0400 Subject: [PATCH] acceptance: bump to Liberty release Upgrade acceptance manifest from Kilo (stable) to Liberty (dev) on both Ubuntu Trusty & Centos7. Change-Id: I5131e4876189c5fbe31d52fc4ed24bedfac7dfb5 Co-Authored-By: Lukas Bezdicka Depends-On: I7c1f31b3cc4c6ea1f894a263a8cff60e357accb8 --- spec/acceptance/ceilometer_with_mysql_spec.rb | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/spec/acceptance/ceilometer_with_mysql_spec.rb b/spec/acceptance/ceilometer_with_mysql_spec.rb index 706f0eff..10bd0be0 100644 --- a/spec/acceptance/ceilometer_with_mysql_spec.rb +++ b/spec/acceptance/ceilometer_with_mysql_spec.rb @@ -12,15 +12,29 @@ describe 'ceilometer with mysql' do case $::osfamily { 'Debian': { include ::apt - class { '::openstack_extras::repo::debian::ubuntu': - release => 'kilo', - package_require => true, + apt::ppa { 'ppa:ubuntu-cloud-archive/liberty-staging': + # it's false by default in 2.x series but true in 1.8.x + package_manage => false, } + Exec['apt_update'] -> Package<||> $package_provider = 'apt' } '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_provider = 'yum'