openstack/devstack
Code Issues Proposed changes

Don't enable osapi_volume if n-vol not enabled.

Browse Source 
Enabling cinder removes osapi_volume from enabled_apis in nova.conf but
if neither cinder or n-vol are enabled it should not be there.  It seems
that volume code is being removed from nova so osapi_volume should not
be enabled by default.

Fixes bug #1073701

Change-Id: I626a941f434b1c8c1a73b32318e21c99445b5541
This commit is contained in:
Andrew Laski 2012-10-31 16:11:37 -04:00
parent 420ff07070
commit 6e7e1c941a
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nova
View File

@ -305,6 +305,8 @@ function create_nova_conf() {
add_nova_opt "enabled_apis=$NOVA_ENABLED_APIS" add_nova_opt "enabled_apis=$NOVA_ENABLED_APIS"
fi fi
if is_service_enabled n-vol; then if is_service_enabled n-vol; then
NOVA_ENABLED_APIS="${NOVA_ENABLED_APIS},osapi_volume"
iniset $NOVA_CONF DEFAULT enabled_apis $NOVA_ENABLED_APIS
add_nova_opt "volume_api_class=nova.volume.api.API" add_nova_opt "volume_api_class=nova.volume.api.API"
add_nova_opt "volume_group=$VOLUME_GROUP" add_nova_opt "volume_group=$VOLUME_GROUP"
add_nova_opt "volume_name_template=${VOLUME_NAME_PREFIX}%s" add_nova_opt "volume_name_template=${VOLUME_NAME_PREFIX}%s"

2
stackrc
View File

@ -18,7 +18,7 @@ DEST=/opt/stack
ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,cinder,c-sch,c-api,c-vol,n-sch,n-novnc,n-xvnc,n-cauth,horizon,mysql,rabbit ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,cinder,c-sch,c-api,c-vol,n-sch,n-novnc,n-xvnc,n-cauth,horizon,mysql,rabbit
# Set the default Nova APIs to enable # Set the default Nova APIs to enable
NOVA_ENABLED_APIS=ec2,osapi_compute,osapi_volume,metadata NOVA_ENABLED_APIS=ec2,osapi_compute,metadata
# Repositories # Repositories
# ------------ # ------------