openstack/devstack
Code Issues Proposed changes

Merge "Set os_region_name for cinder"

Browse Source
This commit is contained in:
Jenkins 2015-03-12 15:22:39 +00:00 committed by Gerrit Code Review
commit 0d8b9b31d2
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cinder
View File

@ -241,6 +241,8 @@ function configure_cinder {
# supported. # supported.
iniset $CINDER_CONF DEFAULT enable_v1_api true 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 if is_service_enabled c-vol && [[ -n "$CINDER_ENABLED_BACKENDS" ]]; then
local enabled_backends="" local enabled_backends=""
local default_name="" local default_name=""

2
lib/nova
View File

@ -544,6 +544,8 @@ function create_nova_conf {
iniset $NOVA_CONF DEFAULT ec2_workers "$API_WORKERS" iniset $NOVA_CONF DEFAULT ec2_workers "$API_WORKERS"
iniset $NOVA_CONF DEFAULT metadata_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 if [[ "$NOVA_BACKEND" == "LVM" ]]; then
iniset $NOVA_CONF libvirt images_type "lvm" iniset $NOVA_CONF libvirt images_type "lvm"
iniset $NOVA_CONF libvirt images_volume_group $DEFAULT_VOLUME_GROUP_NAME iniset $NOVA_CONF libvirt images_volume_group $DEFAULT_VOLUME_GROUP_NAME