commit a7bde1fdf7df38490b80871dd652401fb1721232
author Joe Gordon <joe.gordon0@gmail.com> Fri Sep 26 09:52:13 2014 -0700
committer Joe Gordon <joe.gordon0@gmail.com> Fri Sep 26 09:52:13 2014 -0700
tree b5634dd56b1077b005be1bc1e33b49ca3911933d
parent 18d4778cf7bffa60eb2e996a13c129c64f83575f

Cleanup nova-cinder nova.conf section

Stop using deprecated conf names, don't override default values with
default values.

Change-Id: I2c7e0833a61926b9fc9b5de4e38fdd626501d78d

lib/nova

diff --git a/lib/nova b/lib/nova
index cfa6f7a..319d930 100644
--- a/lib/nova
+++ b/lib/nova
@@ -451,12 +451,11 @@
     fi
 
     if is_service_enabled cinder; then
-        iniset $NOVA_CONF DEFAULT volume_api_class "nova.volume.cinder.API"
         if is_ssl_enabled_service "cinder" || is_service_enabled tls-proxy; then
             CINDER_SERVICE_HOST=${CINDER_SERVICE_HOST:-$SERVICE_HOST}
             CINDER_SERVICE_PORT=${CINDER_SERVICE_PORT:-8776}
-            iniset $NOVA_CONF DEFAULT cinder_endpoint_template "https://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/%(project_id)s"
-            iniset $NOVA_CONF DEFAULT cinder_ca_certificates_file $SSL_BUNDLE_FILE
+            iniset $NOVA_CONF cinder endpoint_template "https://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/%(project_id)s"
+            iniset $NOVA_CONF cinder ca_certificates_file $SSL_BUNDLE_FILE
         fi
     fi