Skip to content

Commit

Permalink
stop puppet from breaking neutron
Browse files Browse the repository at this point in the history
The neutron-ovs-cleanup service is meant to run at boot to tear down ovs
interfaces created by Neutron.  The service runs and then exits, which
means that from Puppet's perspective it is always "stopped".

By setting `ensure => started` on the neutron-ovs-cleanup service,
puppet was starting this service every time it runs, which would
completely disable Neutron networking.

This patch removes the `ensure` setting, such that the service will be
enabled and will run at boot but will not be erroneously started by
Puppet.

Change-Id: I5445fcd05f7cf5c48ded209a2895ea7d8732f40f
  • Loading branch information
larsks committed Jun 14, 2014
1 parent f1ae25a commit 5d953a4
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
1 change: 0 additions & 1 deletion manifests/agents/ovs.pp
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@
}
if $::neutron::params::ovs_cleanup_service {
service {'ovs-cleanup-service':
ensure => $service_ensure,
name => $::neutron::params::ovs_cleanup_service,
enable => $enabled,
}
Expand Down
3 changes: 1 addition & 2 deletions spec/classes/neutron_agents_ovs_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,7 @@
it 'configures neutron ovs cleanup service' do
should contain_service('ovs-cleanup-service').with(
:name => platform_params[:ovs_cleanup_service],
:enable => true,
:ensure => 'running'
:enable => true
)
should contain_package('neutron-plugin-ovs').with_before(/Service\[ovs-cleanup-service\]/)
end
Expand Down

0 comments on commit 5d953a4

Please sign in to comment.