diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/heat-keystone-setup-domain | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/bin/heat-keystone-setup-domain b/bin/heat-keystone-setup-domain index 2621372cd..625adecc7 100755 --- a/bin/heat-keystone-setup-domain +++ b/bin/heat-keystone-setup-domain @@ -23,9 +23,10 @@ from oslo_config import cfg logger = logging.getLogger(__name__) DEBUG = False -USERNAME = os.environ.get('OS_USERNAME', None) -PASSWORD = os.environ.get('OS_PASSWORD', None) +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') opts = [ cfg.StrOpt('stack-user-domain-name', @@ -79,23 +80,25 @@ def main(): level=log_lvl) logging.getLogger('urllib3.connectionpool').setLevel(logging.WARNING) + client_kwargs = { + 'debug': DEBUG, + 'username': USERNAME, + 'password': PASSWORD, + 'auth_url': AUTH_URL, + 'endpoint': AUTH_URL, + 'tenant_name': TENANT_NAME + } + if insecure: - c = client.Client(debug=DEBUG, - username=USERNAME, - password=PASSWORD, - auth_url=AUTH_URL, - endpoint=AUTH_URL, - verify=False) + client_kwargs['verify'] = False else: - c = client.Client(debug=DEBUG, - username=USERNAME, - password=PASSWORD, - auth_url=AUTH_URL, - endpoint=AUTH_URL, - cacert=CACERT, - cert=CERT, - key=KEY) + client_kwargs.update({ + 'cacert': CACERT, + 'cert': CERT, + 'key': KEY + }) + c = client.Client(**client_kwargs) c.authenticate() # Create the heat domain |