From 0ef982864d85890acd061cc4fe31eb9b5320ade5 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Fri, 1 May 2015 12:22:31 -0400
Subject: Revert "Keystone domain for Heat"

This reverts commit 7313930c22b9f18d67e630de084ffcc6fad5ebe7.

Seeing errors when trying to create the keystone admin
role with packages. (ImportError: No module named os_client_config)

Change-Id: I78796598ccb8d2ffd6bfca85dce7d18dc0fd768e
Related-bug: #1450786
---
 overcloud-without-mergepy.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'overcloud-without-mergepy.yaml')

diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index 834dda2b..fce322c8 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -337,9 +337,9 @@ parameters:
     type: string
     hidden: true
   HeatStackDomainAdminPassword:
-    default: unset
-    description: Password for heat_stack_domain_admin user.
+    description: Password for heat_domain_admin user.
     type: string
+    default: ''
     hidden: true
   KeystoneCACertificate:
     default: ''
-- 
cgit 1.2.3-korg