commit 17f52dcd8bdee2783d96343339c60fd6b9d464c6
author Jenkins <jenkins@review.openstack.org> Wed Apr 23 00:03:59 2014 +0000
committer Gerrit Code Review <review@openstack.org> Wed Apr 23 00:03:59 2014 +0000
tree 97f3a5a340058250ce6b2c2f0d1b7d31eda6e690
parent 6cb4f09aca046f9ae78a7ba49a9b57f549a4af61
parent 3317437caca5eb769ab4c6d3ea7c5d3e062517e2

Merge "Don't set nova.conf values to there default value"

lib/nova

diff --git a/lib/nova b/lib/nova
index 47e4afc..a70e2e2 100644
--- a/lib/nova
+++ b/lib/nova
@@ -428,7 +428,6 @@
     iniset $NOVA_CONF DEFAULT default_floating_pool "$PUBLIC_NETWORK_NAME"
     iniset $NOVA_CONF DEFAULT s3_host "$SERVICE_HOST"
     iniset $NOVA_CONF DEFAULT s3_port "$S3_SERVICE_PORT"
-    iniset $NOVA_CONF DEFAULT osapi_compute_extension "nova.api.openstack.compute.contrib.standard_extensions"
     iniset $NOVA_CONF DEFAULT my_ip "$HOST_IP"
     iniset $NOVA_CONF DEFAULT osapi_compute_workers "4"
     iniset $NOVA_CONF DEFAULT ec2_workers "4"
@@ -468,9 +467,6 @@
 
     iniset $NOVA_CONF keystone_authtoken signing_dir $NOVA_AUTH_CACHE_DIR
 
-    if is_service_enabled cinder; then
-        iniset $NOVA_CONF DEFAULT volume_api_class "nova.volume.cinder.API"
-    fi
     if [ -n "$NOVA_STATE_PATH" ]; then
         iniset $NOVA_CONF DEFAULT state_path "$NOVA_STATE_PATH"
         iniset $NOVA_CONF DEFAULT lock_path "$NOVA_STATE_PATH"