Merge "Drop the path from the auth_url."
This commit is contained in:
commit
cc7ffa9884
|
@ -1,12 +1,7 @@
|
||||||
{% if virt_type == 'ironic' and auth_host and ironic_api_ready -%}
|
{% if virt_type == 'ironic' and auth_host and ironic_api_ready -%}
|
||||||
{% if api_version and api_version == "3" -%}
|
|
||||||
{% set auth_ver = "v3" -%}
|
|
||||||
{% else -%}
|
|
||||||
{% set auth_ver = "v2.0" -%}
|
|
||||||
{% endif -%}
|
|
||||||
[ironic]
|
[ironic]
|
||||||
|
auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}
|
||||||
auth_type = password
|
auth_type = password
|
||||||
auth_url = {{auth_protocol}}://{{auth_host}}:{{auth_port}}/{{auth_ver}}
|
|
||||||
project_name = {{ admin_tenant_name }}
|
project_name = {{ admin_tenant_name }}
|
||||||
username = {{ admin_user }}
|
username = {{ admin_user }}
|
||||||
password = {{ admin_password }}
|
password = {{ admin_password }}
|
||||||
|
|
Loading…
Reference in New Issue