Adapt spec_helper_acceptance to work with CentOS

This patch adapts spec_helper_acceptance to work on
CentOS containers. Also fixed indentation

Change-Id: I185473efab30d0b1bcd8ef28d88fdfa18d79591e
This commit is contained in:
Carmela Rubinos 2015-08-06 15:55:08 +02:00
parent 825aed2c93
commit 44f0bbe723
2 changed files with 27 additions and 23 deletions

View File

@ -5,6 +5,9 @@ describe 'midonet all-in-one' do
context 'default parameters' do
it 'should work with no errors' do
pp = <<-EOS
if empty($::augeasversion) {
$augeasversion = '1.0.0'
}
class { 'midonet': } ->
exec { "/sbin/ip tuntap add mode tap testgateway": } ->
exec { "/usr/bin/midonet-cli -e 'create router name \\"MidoNet Provider Router\\"'": } ->
@ -15,7 +18,7 @@ describe 'midonet all-in-one' do
password => 'admin',
interface => 'testgateway',
local_as => '64512',
bgp_port => { 'port_address' => '198.51.100.2', 'net_prefix' => '198.51.100.0', 'net_length' => '30'},
bgp_port => {'port_address' => '198.51.100.2', 'net_prefix' => '198.51.100.0', 'net_length' => '30'},
remote_peers => [{ 'as' => '64513', 'ip' => '198.51.100.1'},
{ 'as' => '64513', 'ip' => '203.0.113.1'}],
advertise_net => [{ 'net_prefix' => '192.0.2.0', 'net_length' => '24' }]

View File

@ -18,6 +18,7 @@ RSpec.configure do |c|
hosts.each do |host|
copy_module_to(host, :source => proj_root, :module_name => 'midonet')
scp_to(host, proj_root + '/data/hiera.yaml', "#{default['puppetpath']}/hiera.yaml")
on host, 'mkdir -p /var/lib/hiera'
scp_to(host, proj_root + '/data/common.yaml', "/var/lib/hiera")
scp_to(host, proj_root + '/data/osfamily', "/var/lib/hiera")