commit d8d4773e258b420f3e9fd1fac73875346e07a4a2
author Vasyl Saienko <vsaienko@mirantis.com> Wed Jul 04 09:46:22 2018 +0000
committer Gerrit Code Review <gerrit2@853267bf53e2> Wed Jul 04 09:46:22 2018 +0000
tree 4b258c770792983458baa3a253c11a0ba9355690
parent 99af257c8d1d10c36bf7a23a343cbd06f4086ec1
parent d5ea19afb93bdb05f7805dcb92c29ee5ab50d8e3

Merge "Pick openstack_region for cinder services from param"

cinder/control/single.yml

diff --git a/cinder/control/single.yml b/cinder/control/single.yml
index 66aea6d..d442693 100644
--- a/cinder/control/single.yml
+++ b/cinder/control/single.yml
@@ -19,4 +19,5 @@
         host: ${_param:single_address}
       identity:
         protocol: ${_param:internal_protocol}
+        region: ${_param:openstack_region}
 

cinder/volume/local.yml

diff --git a/cinder/volume/local.yml b/cinder/volume/local.yml
index 794a33e..d03d6f7 100644
--- a/cinder/volume/local.yml
+++ b/cinder/volume/local.yml
@@ -12,3 +12,4 @@
         host: ${_param:single_address}
       identity:
         host: ${_param:single_address}
+        region: ${_param:openstack_region}

cinder/volume/single.yml

diff --git a/cinder/volume/single.yml b/cinder/volume/single.yml
index b959d32..f66a190 100644
--- a/cinder/volume/single.yml
+++ b/cinder/volume/single.yml
@@ -25,3 +25,4 @@
       identity:
         host: ${_param:openstack_control_address}
         protocol: ${_param:cluster_internal_protocol}
+        region: ${_param:openstack_region}