Merge "Bring Redhat support to acceptance tests"

This commit is contained in:
Jenkins 2015-06-08 16:38:53 +00:00 committed by Gerrit Code Review
commit 58fa67b42d
5 changed files with 29 additions and 0 deletions

View File

@ -3,6 +3,7 @@ source 'https://rubygems.org'
group :development, :test do
gem 'puppetlabs_spec_helper', :require => false
gem 'rspec-puppet', '~> 2.1.0', :require => false
gem 'minitest', '~> 4.7', :require => 'minitest/unit'
gem 'metadata-json-lint'
gem 'puppet-lint-param-docs'

View File

@ -8,6 +8,23 @@ describe 'basic vswitch' do
pp= <<-EOS
Exec { logoutput => 'on_failure' }
case $::osfamily {
'RedHat': {
class { '::openstack_extras::repo::redhat::redhat':
# Kilo is not GA yet, so let's use the testing repo
manage_rdo => false,
repo_hash => {
'rdo-kilo-testing' => {
'baseurl' => 'https://repos.fedorapeople.org/repos/openstack/openstack-kilo/testing/el7/',
# packages are not GA so not signed
'gpgcheck' => '0',
'priority' => 97,
},
},
}
}
}
include ::vswitch::ovs
vs_bridge { 'br-beaker':

View File

@ -0,0 +1,9 @@
HOSTS:
centos-70-x64:
roles:
- master
platform: el-7-x86_64
hypervisor : none
ip: 127.0.0.1
CONFIG:
type: foss

View File

@ -27,6 +27,8 @@ RSpec.configure do |c|
# install library modules from the forge
on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => 0 }
on host, puppet('module','install','stahnma-epel'), { :acceptable_exit_codes => 0 }
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 => 'vswitch')