Merge "Support OS_AUTH_TYPE=none in inventory module"
This commit is contained in:
commit
903834017d
|
@ -125,12 +125,17 @@ def run_module():
|
||||||
tripleo = tc.TripleOCommon(session=conn.session)
|
tripleo = tc.TripleOCommon(session=conn.session)
|
||||||
heat = tripleo.get_orchestration_client()
|
heat = tripleo.get_orchestration_client()
|
||||||
|
|
||||||
|
auth_url = getattr(conn.session.auth, "auth_url", None)
|
||||||
|
username = getattr(conn.session.auth, "_username", None)
|
||||||
|
project = getattr(conn.session.auth, "_project_name", None)
|
||||||
|
cacert = getattr(conn.session.auth, "verify", None)
|
||||||
|
|
||||||
inventory_path = inventory.generate_tripleo_ansible_inventory(
|
inventory_path = inventory.generate_tripleo_ansible_inventory(
|
||||||
heat,
|
heat,
|
||||||
conn.session.auth.auth_url,
|
auth_url,
|
||||||
conn.session.auth._username,
|
username,
|
||||||
conn.session.auth._project_name,
|
project,
|
||||||
conn.session.verify,
|
cacert,
|
||||||
plan,
|
plan,
|
||||||
work_dir,
|
work_dir,
|
||||||
python_interpretor,
|
python_interpretor,
|
||||||
|
|
Loading…
Reference in New Issue