1. devstack
  2. Commit 81dcbbdca842cbf4094755ea432671d75416d05a
Browse code

Actually enable new feature of container-sync

I modified devstack to run newer version of container-sync in
commit d03915f, and cherry-picked to stable/icehouse.
However, $SWIFT_SERVICE_PROTOCOL variable is introduced after
stable/icehouse (commit 18d4778), therefore my cherry-pick patch did
not enable container-sync feature.

This patch replaces this variable with string value "http", so now
icehouse swift deployed by devstack works appropriately.

Change-Id: I3b509312846d29a5d14607d5eb561eb9545b28a5
Closes-Bug: 1378646

Daisuke Morita authored on 2014/11/26 20:44:23
Showing 1 changed files
lib/swift
History View file @ 81dcbbd
... ... 
@@ -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}