Beaker: install APT repo with openstack_extras

Use openstack_extras module to manage Ubuntu Cloud Archive repository.

Change-Id: I163610d2f0207ffd836147498a67c604aa2b8dc7
This commit is contained in:
Emilien Macchi 2015-05-11 16:05:12 -04:00 committed by Colleen Murphy
parent 199d90ec6c
commit d4563e25e7
2 changed files with 5 additions and 20 deletions

View File

@ -9,27 +9,11 @@ describe 'glance class' do
Exec { logoutput => 'on_failure' }
# Common resources
case $::osfamily {
'Debian': {
include ::apt
# some packages are not autoupgraded in trusty.
# it will be fixed in liberty, but broken in kilo.
$need_to_be_upgraded = ['python-tz', 'python-pbr']
apt::source { 'trusty-updates-kilo':
location => 'http://ubuntu-cloud.archive.canonical.com/ubuntu/',
release => 'trusty-updates',
required_packages => 'ubuntu-cloud-keyring',
repos => 'kilo/main',
trusted_source => true,
} ->
package { $need_to_be_upgraded:
ensure => latest,
}
}
'RedHat': {
include ::epel # Get our epel on
}
class { '::openstack_extras::repo::debian::ubuntu':
release => 'kilo',
package_require => true,
}
class { '::mysql::server': }
# Keystone resources, needed by Glance to run

View File

@ -36,6 +36,7 @@ RSpec.configure do |c|
# install puppet modules from git, use master
shell('git clone https://git.openstack.org/stackforge/puppet-openstacklib /etc/puppet/modules/openstacklib')
shell('git clone https://git.openstack.org/stackforge/puppet-keystone /etc/puppet/modules/keystone')
shell('git clone https://git.openstack.org/stackforge/puppet-openstack_extras /etc/puppet/modules/openstack_extras')
# Install the module being tested
puppet_module_install(:source => proj_root, :module_name => 'glance')