From 63fe7f3159e2e752db8ec403c23ad574702732e9 Mon Sep 17 00:00:00 2001
From: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
Date: Thu, 19 Mar 2015 16:55:23 +0000
Subject: Add region to cinder

---
 openstack/usr/share/openstack/openstack-cinder-setup | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/openstack/usr/share/openstack/openstack-cinder-setup b/openstack/usr/share/openstack/openstack-cinder-setup
index eb97d55a..cc427f76 100644
--- a/openstack/usr/share/openstack/openstack-cinder-setup
+++ b/openstack/usr/share/openstack/openstack-cinder-setup
@@ -38,16 +38,16 @@ keystone service-create --name ##CINDER_USER## --type volume --description "Open
 keystone endpoint-create  --service-id $(keystone service-list | awk '/ volume / {print $2}') \
 	    	          --publicurl ##CINDER_PUBLIC_URL## \
 	                  --internalurl ##CINDER_INTERNAL_URL## \
-	                  --adminurl ##CINDER_ADMIN_URL##
+	                  --adminurl ##CINDER_ADMIN_URL## \
+                          --region regionOne
 
 # Register a service and endpoint for version 2 of the Block Storage service API
-keystone service-create --name ##CINDER_USER_V2## \
-	                --type volumev2 --description "OpenStack Block Storage"
+keystone service-create --name ##CINDER_USER_V2## --type volumev2 --description "OpenStack Block Storage"
 keystone endpoint-create  --service-id $(keystone service-list | awk '/ volumev2 / {print $2}') \
 	    	          --publicurl ##CINDER_PUBLIC_URL_V2## \
 	                  --internalurl ##CINDER_INTERNAL_URL_V2## \
-	                  --adminurl ##CINDER_ADMIN_URL_V2##
-
+	                  --adminurl ##CINDER_ADMIN_URL_V2## \
+                          --region regionOne
 # Create run directory for cinder
 if [ ! -d /var/run/cinder ]; then
     mkdir -p /var/run/cinder
-- 
cgit v1.2.1