OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT expects boolean
Previously the single domain mode has been implemented. This is a follow-up commit to set the value properly as boolean instead of string. Change-Id: I0e34d93d05693bf0ca5e8f68bc9af198fd29680a Closes-Bug: #1744346 Related-Bug: #1712999
This commit is contained in:
parent
b4019e45bf
commit
48119619a0
@ -201,7 +201,7 @@ OPENSTACK_KEYSTONE_DEFAULT_ROLE = "{{ default_role }}"
|
|||||||
{% if api_version == "3" -%}
|
{% if api_version == "3" -%}
|
||||||
OPENSTACK_KEYSTONE_URL = "{{ service_protocol }}://%s:{{ service_port }}/v3" % OPENSTACK_HOST
|
OPENSTACK_KEYSTONE_URL = "{{ service_protocol }}://%s:{{ service_port }}/v3" % OPENSTACK_HOST
|
||||||
OPENSTACK_API_VERSIONS = { "identity": 3, }
|
OPENSTACK_API_VERSIONS = { "identity": 3, }
|
||||||
OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = "{{ multi_domain }}"
|
OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = {{ multi_domain }}
|
||||||
OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = "{{ default_domain or admin_domain_id }}"
|
OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = "{{ default_domain or admin_domain_id }}"
|
||||||
{% else -%}
|
{% else -%}
|
||||||
OPENSTACK_KEYSTONE_URL = "{{ service_protocol }}://%s:{{ service_port }}/v2.0" % OPENSTACK_HOST
|
OPENSTACK_KEYSTONE_URL = "{{ service_protocol }}://%s:{{ service_port }}/v2.0" % OPENSTACK_HOST
|
||||||
|
@ -201,7 +201,7 @@ OPENSTACK_KEYSTONE_DEFAULT_ROLE = "{{ default_role }}"
|
|||||||
{% if api_version == "3" -%}
|
{% if api_version == "3" -%}
|
||||||
OPENSTACK_KEYSTONE_URL = "{{ service_protocol }}://%s:{{ service_port }}/v3" % OPENSTACK_HOST
|
OPENSTACK_KEYSTONE_URL = "{{ service_protocol }}://%s:{{ service_port }}/v3" % OPENSTACK_HOST
|
||||||
OPENSTACK_API_VERSIONS = { "identity": 3, }
|
OPENSTACK_API_VERSIONS = { "identity": 3, }
|
||||||
OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = "{{ multi_domain }}"
|
OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = {{ multi_domain }}
|
||||||
OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = "{{ default_domain or admin_domain_id }}"
|
OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = "{{ default_domain or admin_domain_id }}"
|
||||||
{% else -%}
|
{% else -%}
|
||||||
OPENSTACK_KEYSTONE_URL = "{{ service_protocol }}://%s:{{ service_port }}/v2.0" % OPENSTACK_HOST
|
OPENSTACK_KEYSTONE_URL = "{{ service_protocol }}://%s:{{ service_port }}/v2.0" % OPENSTACK_HOST
|
||||||
|
@ -201,7 +201,7 @@ OPENSTACK_KEYSTONE_DEFAULT_ROLE = "{{ default_role }}"
|
|||||||
{% if api_version == "3" -%}
|
{% if api_version == "3" -%}
|
||||||
OPENSTACK_KEYSTONE_URL = "{{ service_protocol }}://%s:{{ service_port }}/v3" % OPENSTACK_HOST
|
OPENSTACK_KEYSTONE_URL = "{{ service_protocol }}://%s:{{ service_port }}/v3" % OPENSTACK_HOST
|
||||||
OPENSTACK_API_VERSIONS = { "identity": 3, }
|
OPENSTACK_API_VERSIONS = { "identity": 3, }
|
||||||
OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = "{{ multi_domain }}"
|
OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = {{ multi_domain }}
|
||||||
OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = "{{ default_domain or admin_domain_id }}"
|
OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = "{{ default_domain or admin_domain_id }}"
|
||||||
{% else -%}
|
{% else -%}
|
||||||
OPENSTACK_KEYSTONE_URL = "{{ service_protocol }}://%s:{{ service_port }}/v2.0" % OPENSTACK_HOST
|
OPENSTACK_KEYSTONE_URL = "{{ service_protocol }}://%s:{{ service_port }}/v2.0" % OPENSTACK_HOST
|
||||||
|
Loading…
Reference in New Issue
Block a user