openstack
/
puppet-ceilometer
Code Issues Proposed changes

Merge "acceptance: bump to Liberty release"

This commit is contained in:
Jenkins 2015-08-14 21:03:16 +00:00 committed by Gerrit Code Review
parent 257a60ce79 3dbe940b19
commit fe4eb1f5ef
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
spec/acceptance/ceilometer_with_mysql_spec.rb
View File

@ -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'