commit 945c3d1d94b8301e933afa02dd8fb667b33834c8
author Vasyl Saienko <vsaienko@mirantis.com> Thu Jul 05 19:01:47 2018 +0000
committer Gerrit Code Review <gerrit2@853267bf53e2> Thu Jul 05 19:01:48 2018 +0000
tree c2490becbaa18797daa358681a56dcfa9cbfe110
parent 1ffd519ef9d587224f1931750930018c826e41c8
parent f16f02d4ebd0161ce667aa8c5b401698bbccb0b0

Merge "Pass region setting to identity"

aodh/server/cluster.yml

diff --git a/aodh/server/cluster.yml b/aodh/server/cluster.yml
index 2ff4ea9..91ebe12 100644
--- a/aodh/server/cluster.yml
+++ b/aodh/server/cluster.yml
@@ -33,6 +33,7 @@
         tenant: service
         user: aodh
         password: ${_param:keystone_aodh_password}
+        region: ${_param:openstack_region}
       message_queue:
         engine: rabbitmq
         port: 5672

aodh/server/single.yml

diff --git a/aodh/server/single.yml b/aodh/server/single.yml
index df4be81..6eec70e 100644
--- a/aodh/server/single.yml
+++ b/aodh/server/single.yml
@@ -5,4 +5,7 @@
     openstack_event_alarm_topic: alarm.all
   aodh:
     server:
+      region: ${_param:openstack_region}
       event_alarm_topic: ${_param:openstack_event_alarm_topic}
+      identity:
+        region: ${_param:openstack_region}

gnocchi/server/cluster.yml

diff --git a/gnocchi/server/cluster.yml b/gnocchi/server/cluster.yml
index 062b60e..1d6e2c2 100644
--- a/gnocchi/server/cluster.yml
+++ b/gnocchi/server/cluster.yml
@@ -14,6 +14,7 @@
       enable_proxy_headers_parsing: true
       identity:
         host: ${_param:openstack_control_address}
+        region: ${_param:openstack_region}
       cache:
         engine: memcached
         members:

gnocchi/server/single.yml

diff --git a/gnocchi/server/single.yml b/gnocchi/server/single.yml
index 035491e..32555cb 100644
--- a/gnocchi/server/single.yml
+++ b/gnocchi/server/single.yml
@@ -1,2 +1,7 @@
 classes:
 - service.gnocchi.server.single
+parameters:
+  gnocchi:
+    server:
+      identity:
+        region: ${_param:openstack_region}
\ No newline at end of file