@@ -451,12 +451,11 @@ function create_nova_conf {

     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