Browse code

Merge "Actually enable new feature of container-sync" into stable/icehouse

Jenkins authored on 2014/12/08 10:34:15
Showing 1 changed files
... ...
@@ -315,7 +315,7 @@ function configure_swift {
315 315
     local csyncfile=${SWIFT_CONF_DIR}/container-sync-realms.conf
316 316
     cp ${SWIFT_DIR}/etc/container-sync-realms.conf-sample ${csyncfile}
317 317
     iniset ${csyncfile} realm1 key realm1key
318
-    iniset ${csyncfile} realm1 cluster_name1 "$SWIFT_SERVICE_PROTOCOL://$SERVICE_HOST:8080/v1/"
318
+    iniset ${csyncfile} realm1 cluster_name1 "http://$SERVICE_HOST:8080/v1/"
319 319
 
320 320
     iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} DEFAULT user
321 321
     iniset ${SWIFT_CONFIG_PROXY_SERVER} DEFAULT user ${STACK_USER}