From bc860bf5a4102069d7bc8b2601e0ba5a7ea2821d Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Tue, 19 Jul 2016 15:27:49 -0500 Subject: [PATCH] Define keystone region name. If multiple regions exist, keystone_authtoken should contain region_name. This prevents the service from authenticating across regions. Change-Id: I0ad99a9d74e8e4e31ae1e126b4c60f3275d1ff23 --- templates/glance-api.conf.j2 | 1 + templates/glance-registry.conf.j2 | 1 + tests/test-vars.yml | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/templates/glance-api.conf.j2 b/templates/glance-api.conf.j2 index 5a140778..5a27a8c4 100644 --- a/templates/glance-api.conf.j2 +++ b/templates/glance-api.conf.j2 @@ -54,6 +54,7 @@ user_domain_id = {{ glance_service_user_domain_id }} project_name = {{ glance_service_project_name }} username = {{ glance_service_user_name }} password = {{ glance_service_password }} +region_name = {{ keystone_service_region }} memcached_servers = {{ memcached_servers }} diff --git a/templates/glance-registry.conf.j2 b/templates/glance-registry.conf.j2 index 2932b907..0abe6a34 100644 --- a/templates/glance-registry.conf.j2 +++ b/templates/glance-registry.conf.j2 @@ -35,6 +35,7 @@ user_domain_id = {{ glance_service_user_domain_id }} project_name = {{ glance_service_project_name }} username = {{ glance_service_user_name }} password = {{ glance_service_password }} +region_name = {{ keystone_service_region }} memcached_servers = {{ memcached_servers }} diff --git a/tests/test-vars.yml b/tests/test-vars.yml index a9194774..e96b6ab0 100644 --- a/tests/test-vars.yml +++ b/tests/test-vars.yml @@ -54,9 +54,10 @@ keystone_service_internaluri: "http://{{ internal_lb_vip_address }}:5000" keystone_service_internaluri_insecure: false keystone_service_internalurl: "{{ keystone_service_internaluri }}/v3" keystone_service_password: "secrete" +keystone_service_region: RegionOne keystone_venv_tag: "testing" memcached_encryption_key: "secrete" memcached_servers: 127.0.0.1 openrc_os_auth_url: "http://127.0.0.1:5000/v3" openrc_os_domain_name: "Default" -openrc_os_password: "{{ keystone_auth_admin_password }}" \ No newline at end of file +openrc_os_password: "{{ keystone_auth_admin_password }}"