From 48119619a0df4445432bfcbcb0a5a0a585226774 Mon Sep 17 00:00:00 2001 From: Nobuto Murata Date: Fri, 19 Jan 2018 17:31:30 +0000 Subject: [PATCH] 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 --- templates/mitaka/local_settings.py | 2 +- templates/newton/local_settings.py | 2 +- templates/ocata/local_settings.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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