commit d329a63d0585354583b6071ae523b206e0c693d8
author Vasyl Saienko <vsaienko@mirantis.com> Fri Jul 06 09:34:06 2018 +0000
committer Gerrit Code Review <gerrit2@853267bf53e2> Fri Jul 06 09:34:06 2018 +0000
tree 8f5700deeb09def1a9a3d23c6f94ffb0a5e5eedc
parent 3e4503e3df6f3c72c0e4888697bde21084c3e6f7
parent 353a5382c6e2f6f1a27b7ca2d6d2536ff7ac0b49

Merge "Fix region for glance,manila,heat"

glance/control/single.yml

diff --git a/glance/control/single.yml b/glance/control/single.yml
index b285d38..5580b66 100644
--- a/glance/control/single.yml
+++ b/glance/control/single.yml
@@ -11,4 +11,6 @@
     server:
       database:
         host: ${_param:single_address}
+      identity:
+        region: ${_param:openstack_region}
       show_multiple_locations: True

heat/server/single.yml

diff --git a/heat/server/single.yml b/heat/server/single.yml
index cd548bf..0c83206 100644
--- a/heat/server/single.yml
+++ b/heat/server/single.yml
@@ -9,6 +9,7 @@
           version: latest
   heat:
     server:
+      region: ${_param:openstack_region}
       stack_domain_admin:
         name: heat_domain_admin
         password: ${_param:heat_domain_admin_password}

manila/common/cluster.yml

diff --git a/manila/common/cluster.yml b/manila/common/cluster.yml
index 8763903..d71364e 100644
--- a/manila/common/cluster.yml
+++ b/manila/common/cluster.yml
@@ -22,7 +22,7 @@
         password: ${_param:mysql_manila_password}
       identity:
         engine: keystone
-        region: RegionOne
+        region: ${_param:openstack_region}
         host: ${_param:cluster_vip_address}
         port: 35357
         user: manila

manila/common/single.yml

diff --git a/manila/common/single.yml b/manila/common/single.yml
index 362338f..1b139c2 100644
--- a/manila/common/single.yml
+++ b/manila/common/single.yml
@@ -20,7 +20,7 @@
         password: ${_param:mysql_manila_password}
       identity:
         engine: keystone
-        region: RegionOne
+        region: ${_param:openstack_region}
         host: ${_param:single_address}
         port: 35357
         user: manila