diff --git a/keystone/manifests/init.pp b/keystone/manifests/init.pp
index 87cd61393..ce0c7bd79 100644
--- a/keystone/manifests/init.pp
+++ b/keystone/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 @@
   $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 @@
     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':