diff --git a/templates/mitaka/local_settings.py b/templates/mitaka/local_settings.py index 85b7124f..ec930578 100644 --- a/templates/mitaka/local_settings.py +++ b/templates/mitaka/local_settings.py @@ -201,7 +201,7 @@ OPENSTACK_KEYSTONE_DEFAULT_ROLE = "{{ default_role }}" {% if api_version == "3" -%} OPENSTACK_KEYSTONE_URL = "{{ service_protocol }}://%s:{{ service_port }}/v3" % OPENSTACK_HOST 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 }}" {% else -%} OPENSTACK_KEYSTONE_URL = "{{ service_protocol }}://%s:{{ service_port }}/v2.0" % OPENSTACK_HOST diff --git a/templates/newton/local_settings.py b/templates/newton/local_settings.py index e4281558..aea9c422 100644 --- a/templates/newton/local_settings.py +++ b/templates/newton/local_settings.py @@ -201,7 +201,7 @@ OPENSTACK_KEYSTONE_DEFAULT_ROLE = "{{ default_role }}" {% if api_version == "3" -%} OPENSTACK_KEYSTONE_URL = "{{ service_protocol }}://%s:{{ service_port }}/v3" % OPENSTACK_HOST 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 }}" {% else -%} OPENSTACK_KEYSTONE_URL = "{{ service_protocol }}://%s:{{ service_port }}/v2.0" % OPENSTACK_HOST diff --git a/templates/ocata/local_settings.py b/templates/ocata/local_settings.py index a2167571..fd6217ba 100644 --- a/templates/ocata/local_settings.py +++ b/templates/ocata/local_settings.py @@ -201,7 +201,7 @@ OPENSTACK_KEYSTONE_DEFAULT_ROLE = "{{ default_role }}" {% if api_version == "3" -%} OPENSTACK_KEYSTONE_URL = "{{ service_protocol }}://%s:{{ service_port }}/v3" % OPENSTACK_HOST 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 }}" {% else -%} OPENSTACK_KEYSTONE_URL = "{{ service_protocol }}://%s:{{ service_port }}/v2.0" % OPENSTACK_HOST