Browse code

Merge "Set os_region_name for cinder"

Jenkins authored on 2015/03/13 00:22:39
Showing 2 changed files
... ...
@@ -241,6 +241,8 @@ function configure_cinder {
241 241
     # supported.
242 242
     iniset $CINDER_CONF DEFAULT enable_v1_api true
243 243
 
244
+    iniset $CINDER_CONF DEFAULT os_region_name "$REGION_NAME"
245
+
244 246
     if is_service_enabled c-vol && [[ -n "$CINDER_ENABLED_BACKENDS" ]]; then
245 247
         local enabled_backends=""
246 248
         local default_name=""
... ...
@@ -544,6 +544,8 @@ function create_nova_conf {
544 544
     iniset $NOVA_CONF DEFAULT ec2_workers "$API_WORKERS"
545 545
     iniset $NOVA_CONF DEFAULT metadata_workers "$API_WORKERS"
546 546
 
547
+    iniset $NOVA_CONF cinder os_region_name "$REGION_NAME"
548
+
547 549
     if [[ "$NOVA_BACKEND" == "LVM" ]]; then
548 550
         iniset $NOVA_CONF libvirt images_type "lvm"
549 551
         iniset $NOVA_CONF libvirt images_volume_group $DEFAULT_VOLUME_GROUP_NAME