Merge "Fixed manage_service feature"

xbezdick · Sep 9, 2014 · 67cc3a8 · 67cc3a8
2 parents 519d2b5 + e396f24
commit 67cc3a8
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/manifests/agents/ovs.pp b/manifests/agents/ovs.pp
@@ -137,17 +137,19 @@
     } else {
       $service_ensure = 'stopped'
     }
-    service { 'neutron-plugin-ovs-service':
-      ensure  => $service_ensure,
-      name    => $::neutron::params::ovs_agent_service,
-      enable  => $enabled,
-      require => Class['neutron'],
-    }
-    if $::neutron::params::ovs_cleanup_service {
-      service {'ovs-cleanup-service':
-        name   => $::neutron::params::ovs_cleanup_service,
-        enable => $enabled,
-      }
+  }
+
+  service { 'neutron-plugin-ovs-service':
+    ensure  => $service_ensure,
+    name    => $::neutron::params::ovs_agent_service,
+    enable  => $enabled,
+    require => Class['neutron'],
+  }
+
+  if $::neutron::params::ovs_cleanup_service {
+    service {'ovs-cleanup-service':
+      name   => $::neutron::params::ovs_cleanup_service,
+      enable => $enabled,
     }
   }