openstack
/
puppet-nova
Code Issues Proposed changes

Beaker: install APT repo with openstack_extras 

Use openstack_extras module to manage Ubuntu Cloud Archive repository.

Change-Id: I254f7ed88f2d3988dce17e5cfeeeed01bacf32d4
This commit is contained in:
Martin Mágr 2015-05-13 16:10:48 +02:00
parent dc2eb5518e
commit e8aeca9273
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
spec/acceptance/basic_nova_spec.rb
View File

@ -8,21 +8,12 @@ describe 'basic nova' do
pp= <<-EOS
Exec { logoutput => 'on_failure' }
# Common resources
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,
} ~>
exec { '/usr/bin/apt-get -y dist-upgrade':
refreshonly => true,
class { '::openstack_extras::repo::debian::ubuntu':
release => 'kilo',
package_require => true,
}
Apt::Source['trusty-updates-kilo'] -> Package<| |>
class { '::mysql::server': }

1
spec/spec_helper_acceptance.rb
View File

@ -35,6 +35,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-openstack_extras /etc/puppet/modules/openstack_extras')
shell('git clone https://git.openstack.org/stackforge/puppet-keystone /etc/puppet/modules/keystone')
shell('git clone https://git.openstack.org/stackforge/puppet-cinder /etc/puppet/modules/cinder')
shell('git clone https://git.openstack.org/stackforge/puppet-glance /etc/puppet/modules/glance')