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

Author: Jenkins

lib/nova

@@ -305,6 +305,8 @@ function create_nova_conf() {
         add_nova_opt "enabled_apis=$NOVA_ENABLED_APIS"
     fi
     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_group=$VOLUME_GROUP"
         add_nova_opt "volume_name_template=${VOLUME_NAME_PREFIX}%s"

stackrc

@@ -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
 
 # Set the default Nova APIs to enable
-NOVA_ENABLED_APIS=ec2,osapi_compute,osapi_volume,metadata
+NOVA_ENABLED_APIS=ec2,osapi_compute,metadata
 
 # Repositories
 # ------------