Perform redhat specific configuration for cisco plugin
Fix to ensure the plugin.ini has link to cisco_plugins.ini when enabled. Updated tests as well to account for the same. Change-Id: Id269db88042625a3d7f12540d07c5033d06e160a
This commit is contained in:
@@ -168,4 +168,14 @@ class neutron::plugins::cisco(
|
|||||||
'keystone/auth_url': value => $keystone_auth_url;
|
'keystone/auth_url': value => $keystone_auth_url;
|
||||||
'keystone/tenant' : value => $keystone_tenant;
|
'keystone/tenant' : value => $keystone_tenant;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if $::osfamily == 'Redhat' {
|
||||||
|
file {'/etc/neutron/plugin.ini':
|
||||||
|
ensure => link,
|
||||||
|
target => '/etc/neutron/plugins/cisco/cisco_plugins.ini',
|
||||||
|
require => Package['neutron-plugin-cisco'],
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -3,7 +3,8 @@ require 'spec_helper'
|
|||||||
describe 'neutron::plugins::cisco' do
|
describe 'neutron::plugins::cisco' do
|
||||||
|
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { 'neutron::server': auth_password => 'password'}"
|
"class { 'neutron::server': auth_password => 'password'}
|
||||||
|
class { 'neutron': rabbit_password => 'passw0rd' }"
|
||||||
end
|
end
|
||||||
|
|
||||||
let :params do
|
let :params do
|
||||||
@@ -132,4 +133,21 @@ describe 'neutron::plugins::cisco' do
|
|||||||
)
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'on RedHat platforms' do
|
||||||
|
let :facts do
|
||||||
|
{ :osfamily => 'RedHat' }
|
||||||
|
end
|
||||||
|
|
||||||
|
it_configures 'default cisco plugin'
|
||||||
|
it 'should perform redhat specific configuration' do
|
||||||
|
should contain_file('/etc/neutron/plugin.ini').with(
|
||||||
|
:ensure => 'link',
|
||||||
|
:target => '/etc/neutron/plugins/cisco/cisco_plugins.ini',
|
||||||
|
:require => 'Package[neutron-plugin-cisco]'
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
Reference in New Issue
Block a user