Get region from correct variable name
Region is set in client|server.identity.region pillar.
This patch updates client and server states to pick region
from correct variable.
Change-Id: I9110e9d419e7b6cc6ed6c13486ea57d7169b12dd
Related-Prod: PROD-21075
diff --git a/cinder/client.sls b/cinder/client.sls
index c104985..edfec18 100644
--- a/cinder/client.sls
+++ b/cinder/client.sls
@@ -29,7 +29,7 @@
'project_id': identity.project,
'port': identity.get('port', 35357),
'protocol': identity.get('protocol', 'http'),
- 'region_name': identity.get('region_name', 'RegionOne'),
+ 'region_name': identity.get('region', 'RegionOne'),
'endpoint_type': identity.get('endpoint_type', 'internalURL'),
'certificate': identity.get('certificate', client.cacert_file),
'api_version': keystone_api_version} %}
diff --git a/cinder/controller.sls b/cinder/controller.sls
index a30bd66..986d8d9 100644
--- a/cinder/controller.sls
+++ b/cinder/controller.sls
@@ -302,7 +302,7 @@
'project_id': identity.tenant,
'port': identity.get('port', 35357),
'protocol': identity.get('protocol', 'http'),
- 'region_name': identity.get('region_name', 'RegionOne'),
+ 'region_name': identity.get('region', 'RegionOne'),
'endpoint_type': identity.get('endpoint_type', 'internalURL'),
'certificate': identity.get('certificate', controller.cacert_file),
'api_version': keystone_api_version} %}