From 1745a9b950849fd5e8a2a13a5fab1c6be515b1d0 Mon Sep 17 00:00:00 2001
From: Sharmin Choksey <schoksey@cisco.com>
Date: Fri, 24 Feb 2017 12:29:24 -0800
Subject: [PATCH] Fixes heat-keystone-setup-domain authentication failures with
 v3

With keystone v3 configured, attempting to create a heat domain
and heat user fails with authentication errors

Change-Id: Ieb1cb7a62b32e842d80020b4ab2870ef1394ba86
Closes-Bug: #1667795
---
 bin/heat-keystone-setup-domain | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/bin/heat-keystone-setup-domain b/bin/heat-keystone-setup-domain
index d61393e108..ae17bcb748 100755
--- a/bin/heat-keystone-setup-domain
+++ b/bin/heat-keystone-setup-domain
@@ -29,7 +29,9 @@ DEBUG = False
 USERNAME = os.environ.get('OS_USERNAME')
 PASSWORD = os.environ.get('OS_PASSWORD')
 AUTH_URL = os.environ.get('OS_AUTH_URL', '').replace('v2.0', 'v3')
-TENANT_NAME = os.environ.get('OS_TENANT_NAME')
+PROJECT_NAME = os.environ.get('OS_PROJECT_NAME')
+USER_DOMAIN_NAME = os.environ.get('OS_USER_DOMAIN_NAME')
+PROJECT_DOMAIN_NAME = os.environ.get('OS_PROJECT_DOMAIN_NAME')
 
 opts = [
     cfg.StrOpt('stack-user-domain-name',
@@ -82,9 +84,6 @@ HEAT_DOMAIN_PASSWORD = os.environ.get('HEAT_DOMAIN_PASSWORD',
                                       cfg.CONF.stack_domain_admin_password)
 HEAT_DOMAIN_DESCRIPTION = 'Contains users and projects created by heat'
 
-logger.debug("USERNAME=%s" % USERNAME)
-logger.debug("AUTH_URL=%s" % AUTH_URL)
-
 CACERT = os.environ.get('OS_CACERT', cfg.CONF.os_cacert)
 CERT = os.environ.get('OS_CERT', cfg.CONF.os_cert)
 KEY = os.environ.get('OS_KEY', cfg.CONF.os_key)
@@ -98,9 +97,12 @@ def main():
         'password': PASSWORD,
         'auth_url': AUTH_URL,
         'endpoint': AUTH_URL,
-        'tenant_name': TENANT_NAME
+        'project_name': PROJECT_NAME,
+        'user_domain_name': USER_DOMAIN_NAME,
+        'project_domain_name': PROJECT_DOMAIN_NAME
     }
 
+
     if insecure:
         client_kwargs['verify'] = False
     else: