From e396f24b5d694b9dcf81f9d1dc9b95727af0a5ba Mon Sep 17 00:00:00 2001
From: Martin Magr <mmagr@redhat.com>
Date: Tue, 26 Aug 2014 17:54:12 +0200
Subject: [PATCH] Fixed manage_service feature

Using manage_service=>false in class neutron::agents::ovs generates
error. This patch is fixing the issue and makes mentioned use-case
installable.

Change-Id: I5a3205c3e21e1312463f47d938f5854a189c5d38
Closes-bug: #1359823
---
 manifests/agents/ovs.pp | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/manifests/agents/ovs.pp b/manifests/agents/ovs.pp
index c8eba9df0..082a4b14c 100644
--- 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,
     }
   }