From 1ad727890c84743805737b8fbb3ae2b20eaa30b5 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 16 Feb 2022 11:08:12 +0900
Subject: [PATCH] Do not define service resource when service management is
 disabled

Change-Id: I63c9c6c4df6cc0968a704546453416431b0fca07
---
 manifests/api.pp      | 16 ++++++++--------
 manifests/metadata.pp | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/manifests/api.pp b/manifests/api.pp
index ad699ae..330060b 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -336,15 +336,15 @@ class ec2api::api (
     } else {
       $service_ensure = 'stopped'
     }
-  }
 
-  service { 'openstack-ec2-api-service' :
-    ensure     => $service_ensure,
-    name       => $service_name,
-    enable     => $enabled,
-    hasstatus  => true,
-    hasrestart => true,
-    tag        => 'ec2api-service',
+    service { 'openstack-ec2-api-service' :
+      ensure     => $service_ensure,
+      name       => $service_name,
+      enable     => $enabled,
+      hasstatus  => true,
+      hasrestart => true,
+      tag        => 'ec2api-service',
+    }
   }
 
 }
diff --git a/manifests/metadata.pp b/manifests/metadata.pp
index 0cf074a..e1c7a78 100644
--- a/manifests/metadata.pp
+++ b/manifests/metadata.pp
@@ -125,15 +125,15 @@ class ec2api::metadata (
     } else {
       $service_ensure = 'stopped'
     }
-  }
 
-  service { 'openstack-ec2-metadata-service' :
-    ensure     => $service_ensure,
-    name       => $service_name,
-    enable     => $enabled,
-    hasstatus  => true,
-    hasrestart => true,
-    tag        => 'ec2api-service',
+    service { 'openstack-ec2-metadata-service' :
+      ensure     => $service_ensure,
+      name       => $service_name,
+      enable     => $enabled,
+      hasstatus  => true,
+      hasrestart => true,
+      tag        => 'ec2api-service',
+    }
   }
 
 }