openstack/heat
Code Issues Proposed changes

Merge "Fixes heat-keystone-setup-domain authentication failures with v3"

Browse Source
This commit is contained in:
Zuul 2017-12-04 09:14:11 +00:00 committed by Gerrit Code Review
commit d84db90b80
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/heat-keystone-setup-domain
View File

@ -29,7 +29,9 @@ DEBUG = False
USERNAME = os.environ.get('OS_USERNAME') USERNAME = os.environ.get('OS_USERNAME')
PASSWORD = os.environ.get('OS_PASSWORD') PASSWORD = os.environ.get('OS_PASSWORD')
AUTH_URL = os.environ.get('OS_AUTH_URL', '').replace('v2.0', 'v3') 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 = [ opts = [
cfg.StrOpt('stack-user-domain-name', 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) cfg.CONF.stack_domain_admin_password)
HEAT_DOMAIN_DESCRIPTION = 'Contains users and projects created by heat' 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) CACERT = os.environ.get('OS_CACERT', cfg.CONF.os_cacert)
CERT = os.environ.get('OS_CERT', cfg.CONF.os_cert) CERT = os.environ.get('OS_CERT', cfg.CONF.os_cert)
KEY = os.environ.get('OS_KEY', cfg.CONF.os_key) KEY = os.environ.get('OS_KEY', cfg.CONF.os_key)
@ -98,9 +97,12 @@ def main():
'password': PASSWORD, 'password': PASSWORD,
'auth_url': AUTH_URL, 'auth_url': AUTH_URL,
'endpoint': 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: if insecure:
client_kwargs['verify'] = False client_kwargs['verify'] = False
else: else: