Merge "Set os_region_name for cinder"
diff --git a/lib/cinder b/lib/cinder
index bc8a481..880af1f 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -241,6 +241,8 @@
# supported.
iniset $CINDER_CONF DEFAULT enable_v1_api true
+ iniset $CINDER_CONF DEFAULT os_region_name "$REGION_NAME"
+
if is_service_enabled c-vol && [[ -n "$CINDER_ENABLED_BACKENDS" ]]; then
local enabled_backends=""
local default_name=""
diff --git a/lib/nova b/lib/nova
index e9e78c7..199daee 100644
--- a/lib/nova
+++ b/lib/nova
@@ -544,6 +544,8 @@
iniset $NOVA_CONF DEFAULT ec2_workers "$API_WORKERS"
iniset $NOVA_CONF DEFAULT metadata_workers "$API_WORKERS"
+ iniset $NOVA_CONF cinder os_region_name "$REGION_NAME"
+
if [[ "$NOVA_BACKEND" == "LVM" ]]; then
iniset $NOVA_CONF libvirt images_type "lvm"
iniset $NOVA_CONF libvirt images_volume_group $DEFAULT_VOLUME_GROUP_NAME