openstack/puppet-neutron
Code Issues Proposed changes

Merge "Add neutron server dependency for cisco plugin config"

Browse Source
This commit is contained in:
Jenkins 2013-08-20 18:27:08 +00:00 committed by Gerrit Code Review
commit 26f1aed03e
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/plugins/cisco.pp
View File

@ -113,7 +113,7 @@ class neutron::plugins::cisco(
path => '/etc/default/neutron-server', path => '/etc/default/neutron-server',
match => '^NEUTRON_PLUGIN_CONFIG=(.*)$', match => '^NEUTRON_PLUGIN_CONFIG=(.*)$',
line => "NEUTRON_PLUGIN_CONFIG=${::neutron::params::cisco_config_file}", line => "NEUTRON_PLUGIN_CONFIG=${::neutron::params::cisco_config_file}",
require => Package['neutron-plugin-cisco'], require => [ Package['neutron-server'], Package['neutron-plugin-cisco'] ],
notify => Service['neutron-server'], notify => Service['neutron-server'],
} }
} }

11
spec/classes/neutron_plugins_cisco_spec.rb
View File

@ -122,7 +122,14 @@ describe 'neutron::plugins::cisco' do
context 'on Debian platforms' do context 'on Debian platforms' do
let :facts do let :facts do
{ :osfamily => 'Debian' } { :osfamily => 'Debian' }
end end
it_configures 'default cisco plugin'
it_configures 'default cisco plugin'
it 'configures /etc/default/neutron-server' do
should contain_file_line('/etc/default/neutron-server:NEUTRON_PLUGIN_CONFIG').with(
:line => 'NEUTRON_PLUGIN_CONFIG=/etc/neutron/plugins/cisco/cisco_plugins.ini',
:require => ['Package[neutron-server]', 'Package[neutron-plugin-cisco]']
)
end
end end
end end