diff --git a/cinder/files/kilo/cinder.conf.controller.Debian b/cinder/files/kilo/cinder.conf.controller.Debian
index 120c713..5f723fe 100644
--- a/cinder/files/kilo/cinder.conf.controller.Debian
+++ b/cinder/files/kilo/cinder.conf.controller.Debian
@@ -20,6 +20,8 @@
 glance_num_retries=0
 debug=False
 
+os_region_name={{ controller.identity.region }}
+
 #glance_api_ssl_compression=False
 #glance_api_insecure=False
 
diff --git a/cinder/files/kilo/cinder.conf.volume.Debian b/cinder/files/kilo/cinder.conf.volume.Debian
index da480c1..5ec2e6b 100644
--- a/cinder/files/kilo/cinder.conf.volume.Debian
+++ b/cinder/files/kilo/cinder.conf.volume.Debian
@@ -20,6 +20,8 @@
 glance_num_retries=0
 debug=False
 
+os_region_name={{ volume.identity.region }}
+
 #glance_api_ssl_compression=False
 #glance_api_insecure=False
 
diff --git a/cinder/files/liberty/cinder.conf.controller.Debian b/cinder/files/liberty/cinder.conf.controller.Debian
index 3c12e4b..4625b38 100644
--- a/cinder/files/liberty/cinder.conf.controller.Debian
+++ b/cinder/files/liberty/cinder.conf.controller.Debian
@@ -20,6 +20,8 @@
 glance_num_retries=0
 debug=False
 
+os_region_name={{ controller.identity.region }}
+
 #glance_api_ssl_compression=False
 #glance_api_insecure=False
 
diff --git a/cinder/files/liberty/cinder.conf.volume.Debian b/cinder/files/liberty/cinder.conf.volume.Debian
index da480c1..5ec2e6b 100644
--- a/cinder/files/liberty/cinder.conf.volume.Debian
+++ b/cinder/files/liberty/cinder.conf.volume.Debian
@@ -20,6 +20,8 @@
 glance_num_retries=0
 debug=False
 
+os_region_name={{ volume.identity.region }}
+
 #glance_api_ssl_compression=False
 #glance_api_insecure=False
 
diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index b7367ba..19ab029 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -18,6 +18,7 @@
         password: ${_param:mysql_cinder_password}
       identity:
         engine: keystone
+        region: RegionOne
         host: ${_param:cluster_vip_address}
         port: 35357
         tenant: service
diff --git a/metadata/service/control/cluster_control.yml b/metadata/service/control/cluster_control.yml
index b7367ba..19ab029 100644
--- a/metadata/service/control/cluster_control.yml
+++ b/metadata/service/control/cluster_control.yml
@@ -18,6 +18,7 @@
         password: ${_param:mysql_cinder_password}
       identity:
         engine: keystone
+        region: RegionOne
         host: ${_param:cluster_vip_address}
         port: 35357
         tenant: service
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index df86a58..f52b8a6 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -18,6 +18,7 @@
         password: ${_param:mysql_cinder_password}
       identity:
         engine: keystone
+        region: RegionOne
         host: ${_param:single_address}
         port: 35357
         tenant: service
diff --git a/metadata/service/volume/single.yml b/metadata/service/volume/single.yml
index f7ea1d5..2cf5c2b 100644
--- a/metadata/service/volume/single.yml
+++ b/metadata/service/volume/single.yml
@@ -18,6 +18,7 @@
         password: ${_param:mysql_cinder_password}
       identity:
         engine: keystone
+        region: RegionOne
         host: ${_param:cluster_vip_address}
         port: 35357
         tenant: service
diff --git a/other-requirements.txt b/other-requirements.txt
new file mode 100644
index 0000000..ba84cc5
--- /dev/null
+++ b/other-requirements.txt
@@ -0,0 +1 @@
+python-yaml
diff --git a/tests/pillar/control_cluster.sls b/tests/pillar/control_cluster.sls
index 430eb04..0f2ea95 100644
--- a/tests/pillar/control_cluster.sls
+++ b/tests/pillar/control_cluster.sls
@@ -13,6 +13,7 @@
       password: password
     identity:
       engine: keystone
+      region: RegionOne
       host: 127.0.0.1
       port: 35357
       tenant: service
diff --git a/tests/pillar/control_single.sls b/tests/pillar/control_single.sls
index 5b9c1bd..d9d6a73 100644
--- a/tests/pillar/control_single.sls
+++ b/tests/pillar/control_single.sls
@@ -14,6 +14,7 @@
     identity:
       engine: keystone
       host: 127.0.0.1
+      region: RegionOne
       port: 35357
       tenant: service
       user: cinder