From 47c293e4c90ba332417296ac036c70bc82179b42 Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Tue, 19 Jul 2016 15:22:31 -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: I119ac50e3e643053f2d15f1546107c871238f974 --- templates/cinder.conf.j2 | 3 +++ tests/test-vars.yml | 1 + 2 files changed, 4 insertions(+) diff --git a/templates/cinder.conf.j2 b/templates/cinder.conf.j2 index 4e919df9..ddc77b5a 100644 --- a/templates/cinder.conf.j2 +++ b/templates/cinder.conf.j2 @@ -60,6 +60,8 @@ quota_backup_gigabytes = {{ cinder_quota_backup_gigabytes }} nova_catalog_info = {{ cinder_nova_catalog_info }} nova_catalog_admin_info = {{ cinder_nova_catalog_admin_info }} +os_region_name = {{ cinder_service_region }} + ## Glance glance_api_servers = {{ cinder_glance_api_servers }} glance_num_retries = 0 @@ -138,6 +140,7 @@ user_domain_id = {{ cinder_service_user_domain_id }} project_name = {{ cinder_service_project_name }} username = {{ cinder_service_user_name }} password = {{ cinder_service_password }} +region_name = {{ keystone_service_region }} memcached_servers = {{ memcached_servers }} diff --git a/tests/test-vars.yml b/tests/test-vars.yml index 82183053..90bac14d 100644 --- a/tests/test-vars.yml +++ b/tests/test-vars.yml @@ -48,6 +48,7 @@ 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