Beaker: install APT repo with openstack_extras

Use openstack_extras module to manage Ubuntu Cloud Archive repository.

Change-Id: I5bf3bd0e2e1b8db49752abca823203ff225713c4

diff --git a/spec/acceptance/ceilometer_with_mysql_spec.rb b/spec/acceptance/ceilometer_with_mysql_spec.rb
index a66293df382d61879ead526331b349461d4f2967..7d6998216a39bf98a35e88364cb3485b0f96ff9c 100644 (file)
--- a/spec/acceptance/ceilometer_with_mysql_spec.rb
+++ b/spec/acceptance/ceilometer_with_mysql_spec.rb
@@ -10,20 +10,10 @@ describe 'ceilometer with mysql' 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 32a0d818d16296751193a5e461c82a23c074014f..5e3340170350d5ff4ddcddd947231f5d085d696f 100644 (file)
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -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')
 
       # Install the module being tested