openstack/puppet-neutron
Code Issues Proposed changes

for OVS agent, fix dependency on service

Browse Source 
Previously, the declaration for vs_bridge required the service, but if
the service is not enabled it's not declared.  This moves the dependency
inside an if.  See bug #1298146 for the background.

Change-Id: Ic51efb16d4ba0a971178ff648f963c61b2e9fdde
Closes-Bug: #1337733
This commit is contained in:
Xav Paice 2014-07-04 19:05:02 +12:00
parent 837e27cec8
commit 064899b70e
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/agents/ovs.pp
View File

@ -38,6 +38,7 @@ class neutron::agents::ovs (
Neutron_plugin_ovs<||> ~> Service['neutron-plugin-ovs-service']
Neutron::Plugins::Ovs::Bridge<||> -> Service['neutron-plugin-ovs-service']
Neutron::Plugins::Ovs::Port<||> -> Service['neutron-plugin-ovs-service']
Vs_bridge<||> -> Service['neutron-plugin-ovs-service']
}
if ($bridge_mappings != []) {
@ -78,7 +79,6 @@ class neutron::agents::ovs (
vs_bridge { $integration_bridge:
ensure => present,
before => Service['neutron-plugin-ovs-service'],
}
if $enable_tunneling {

11
spec/classes/neutron_agents_ovs_spec.rb
View File

@ -46,11 +46,7 @@ describe 'neutron::agents::ovs' do
end
it 'configures vs_bridge' do
should contain_vs_bridge(p[:integration_bridge]).with(
:ensure => 'present',
:before => 'Service[neutron-plugin-ovs-service]'
)
should_not contain_vs_brige(p[:integration_bridge])
should contain_vs_bridge(p[:integration_bridge]).with_ensure('present')
end
it 'installs neutron ovs agent package' do
@ -148,10 +144,7 @@ describe 'neutron::agents::ovs' do
should contain_neutron_plugin_ovs('OVS/enable_tunneling').with_value(true)
should contain_neutron_plugin_ovs('OVS/tunnel_bridge').with_value(default_params[:tunnel_bridge])
should contain_neutron_plugin_ovs('OVS/local_ip').with_value('127.0.0.1')
should contain_vs_bridge(default_params[:tunnel_bridge]).with(
:ensure => 'present',
:before => 'Service[neutron-plugin-ovs-service]'
)
should contain_vs_bridge(default_params[:tunnel_bridge]).with_ensure('present')
end
end