Merge "stop puppet from breaking neutron"

redhat-openstack · Jun 16, 2014 · dd91a68 · dd91a68
2 parents 069d086 + 5d953a4
commit dd91a68
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/manifests/agents/ovs.pp b/manifests/agents/ovs.pp
@@ -145,7 +145,6 @@
     }
     if $::neutron::params::ovs_cleanup_service {
       service {'ovs-cleanup-service':
-        ensure => $service_ensure,
         name   => $::neutron::params::ovs_cleanup_service,
         enable => $enabled,
       }

diff --git a/spec/classes/neutron_agents_ovs_spec.rb b/spec/classes/neutron_agents_ovs_spec.rb
@@ -198,8 +198,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