commit 38924fff48bc3ec8972b92410080a2d944d735a1
author Mykyta Karpin <mkarpin@mirantis.com> Mon Jul 16 13:29:27 2018 +0000
committer Gerrit Code Review <gerrit2@853267bf53e2> Mon Jul 16 13:29:27 2018 +0000
tree 21224fc33a5cf3a9460747448f67fd5c3f289bb5
parent 515b05f25b6bf4a8b9883012bf5e16db9f61360f
parent 83040cb87c2f5e0c47a6daeb4572ad8b2cb169c6

Merge "Override default region from cluster level" into stable/queens

classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml

diff --git a/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml b/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml
index 3a98dd8..25969da 100755
--- a/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-telemetry/openstack/init.yml
@@ -85,11 +85,13 @@
           enabled: ${_param:rabbitmq_ssl_enabled}
   ceilometer:
     server:
+      region: ${_param:openstack_region}
       message_queue:
         port: ${_param:rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
     agent:
+      region: ${_param:openstack_region}
       polling:
         sources:
           default_pollsters:
@@ -100,3 +102,5 @@
       database:
         ssl:
           enabled: ${_param:galera_ssl_enabled}
+      identity:
+        region: ${_param:openstack_region}