openstack/bifrost
Code Issues Proposed changes

Merge "Allow Ironic URL to use env vars in bifrost_inventory.py"

Browse Source
This commit is contained in:
Zuul 2019-02-06 17:14:20 +00:00 committed by Gerrit Code Review
commit 177ce1faef
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bifrost/inventory.py
View File

@ -325,9 +325,13 @@ def _process_baremetal_csv(data_source, groups, hostvars):
def _identify_shade_auth(): def _identify_shade_auth():
"""Return shade credentials""" """Return shade credentials"""
if os.environ.get('OS_CLOUD'):
return {}
endpoint = os.getenv('OS_URL',
os.getenv('IRONIC_URL', "http://localhost:6385/"))
options = dict( options = dict(
auth_type="None", auth_type="None",
auth=dict(endpoint="http://localhost:6385/",) auth=dict(endpoint=endpoint,)
) )
if os.environ.get('OS_AUTH_URL'): if os.environ.get('OS_AUTH_URL'):
options['auth_type'] = "password" options['auth_type'] = "password"