Browse code

Merge "Use the $SERVICE_HOST in backup_swift_url"

Jenkins authored on 2014/04/04 12:42:47
Showing 1 changed files
... ...
@@ -274,6 +274,10 @@ function configure_cinder {
274 274
     iniset $CINDER_CONF DEFAULT lock_path $CINDER_STATE_PATH
275 275
     iniset $CINDER_CONF DEFAULT periodic_interval $CINDER_PERIODIC_INTERVAL
276 276
 
277
+    if is_service_enabled swift; then
278
+        iniset $CINDER_CONF DEFAULT backup_swift_url "http://$SERVICE_HOST:8080/v1/AUTH_"
279
+    fi
280
+
277 281
     if is_service_enabled ceilometer; then
278 282
         iniset $CINDER_CONF DEFAULT notification_driver "cinder.openstack.common.notifier.rpc_notifier"
279 283
     fi