From 1a8a61aaa21185d13be628be738ef432a0bca6bf Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Sun, 19 Aug 2012 00:43:41 -0700
Subject: [PATCH] Support enabled for keystone

This commit adds support for keystone servers
running in passive mode.
---
 manifests/keystone.pp | 52 ++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/manifests/keystone.pp b/manifests/keystone.pp
index 32466df..29a502c 100644
--- a/manifests/keystone.pp
+++ b/manifests/keystone.pp
@@ -49,37 +49,39 @@ class openstack::keystone (
     enabled      => $enabled,
   }
 
-  # Setup the admin user
-  class { 'keystone::roles::admin':
-    email        => $admin_email,
-    password     => $admin_password,
-    admin_tenant => $keystone_admin_tenant,
-  }
+  if ($enabled) {
+    # Setup the admin user
+    class { 'keystone::roles::admin':
+      email        => $admin_email,
+      password     => $admin_password,
+      admin_tenant => $keystone_admin_tenant,
+    }
 
-  # Setup the Keystone Identity Endpoint
-  class { 'keystone::endpoint':
-    public_address   => $public_address,
-    admin_address    => $admin_address,
-    internal_address => $internal_address,
-  }
-
-  # Configure Glance endpoint in Keystone
-  if $glance {
-    class { 'glance::keystone::auth':
-      password         => $glance_user_password,
+    # Setup the Keystone Identity Endpoint
+    class { 'keystone::endpoint':
       public_address   => $public_address,
       admin_address    => $admin_address,
       internal_address => $internal_address,
     }
-  }
 
-  # Configure Nova endpoint in Keystone
-  if $nova {
-    class { 'nova::keystone::auth':
-      password         => $nova_user_password,
-      public_address   => $public_address,
-      admin_address    => $admin_address,
-      internal_address => $internal_address,
+    # Configure Glance endpoint in Keystone
+    if $glance {
+      class { 'glance::keystone::auth':
+        password         => $glance_user_password,
+        public_address   => $public_address,
+        admin_address    => $admin_address,
+        internal_address => $internal_address,
+      }
+    }
+
+    # Configure Nova endpoint in Keystone
+    if $nova {
+      class { 'nova::keystone::auth':
+        password         => $nova_user_password,
+        public_address   => $public_address,
+        admin_address    => $admin_address,
+        internal_address => $internal_address,
+      }
     }
   }