diff --git a/spec/acceptance/basic_designate_spec.rb b/spec/acceptance/basic_designate_spec.rb index 9c59442c..febb310d 100644 --- a/spec/acceptance/basic_designate_spec.rb +++ b/spec/acceptance/basic_designate_spec.rb @@ -10,20 +10,10 @@ describe 'basic designate' do # 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': } diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index f293a532..14fb7669 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -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 => 'designate')