From 442fcb0645b8f65b42f6bc3c301bdd0f73906a48 Mon Sep 17 00:00:00 2001
From: Tim Laszlo <tim.laszlo@gmail.com>
Date: Tue, 19 Jul 2016 15:14:09 -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: I35771c73954fb8962bbcc7ae8963900b68ea5e5c
---
 templates/aodh.conf.j2 | 1 +
 tests/test.yml         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/templates/aodh.conf.j2 b/templates/aodh.conf.j2
index 45a3a46..9afd1a4 100644
--- a/templates/aodh.conf.j2
+++ b/templates/aodh.conf.j2
@@ -31,6 +31,7 @@ user_domain_id = {{ aodh_service_user_domain_id }}
 project_name = {{ aodh_service_project_name }}
 username = {{ aodh_service_user_name }}
 password = {{ aodh_service_password }}
+region_name = {{ keystone_service_region }}
 
 memcached_servers = {{ memcached_servers }}
 
diff --git a/tests/test.yml b/tests/test.yml
index 41da5af..b92d3f4 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -271,6 +271,7 @@
     keystone_service_internalurl: "{{ keystone_service_internaluri }}/v3"
     keystone_service_adminuri: "http://{{ internal_lb_vip_address }}:35357"
     keystone_service_adminurl: "{{ keystone_service_adminuri }}/v3"
+    keystone_service_region: RegionOne
     aodh_venv_tag: "testing"
     aodh_developer_mode: true
     aodh_git_install_branch: master