From 97662a32ec863f69d15c4e3af635f997cfa92208 Mon Sep 17 00:00:00 2001
From: Martin Magr <mmagr@redhat.com>
Date: Mon, 25 Aug 2014 14:52:37 +0200
Subject: [PATCH] Add manage_service feature
puppet-keystone lacks of disabling service managing. This patch adds
$manage_service parameter to relevant class.
Change-Id: I80a55857442c6cd32387481fbe68b54f52e827a1
Closes-bug: #1359823
Conflicts:
manifests/init.pp
---
manifests/init.pp | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/manifests/init.pp b/manifests/init.pp
index 87cd613..ce0c7bd 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -38,6 +38,11 @@
# Defaults to /var/cache/keystone.
# [memcache_servers] List of memcache servers/ports. Optional. Used with
# token_driver keystone.token.backends.memcache.Token. Defaults to false.
+#
+# [manage_service]
+# (optional) If Puppet should manage service startup / shutdown.
+# Defaults to true.
+#
# [enabled] If the keystone services should be enabled. Optional. Default to true.
# [sql_connection] Url used to connect to database.
# [idle_timeout] Timeout when db connections should be reaped.
@@ -168,6 +173,7 @@ class keystone(
$ssl_cert_subject = '/C=US/ST=Unset/L=Unset/O=Unset/CN=localhost',
$cache_dir = '/var/cache/keystone',
$memcache_servers = false,
+ $manage_service = true,
$enabled = true,
$sql_connection = 'sqlite:////var/lib/keystone/keystone.db',
$idle_timeout = '200',
@@ -403,10 +409,12 @@ class keystone(
keystone_config { 'DEFAULT/rabbit_ha_queues': value => false }
}
- if $enabled {
- $service_ensure = 'running'
- } else {
- $service_ensure = 'stopped'
+ if $manage_service {
+ if $enabled {
+ $service_ensure = 'running'
+ } else {
+ $service_ensure = 'stopped'
+ }
}
service { 'keystone':
--
1.9.3