Actually enable new feature of container-sync
I modified devstack to run newer version of container-sync in commitd03915f, and cherry-picked to stable/icehouse. However, $SWIFT_SERVICE_PROTOCOL variable is introduced after stable/icehouse (commit18d4778), 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
This commit is contained in:
@@ -315,7 +315,7 @@ function configure_swift {
|
||||
local csyncfile=${SWIFT_CONF_DIR}/container-sync-realms.conf
|
||||
cp ${SWIFT_DIR}/etc/container-sync-realms.conf-sample ${csyncfile}
|
||||
iniset ${csyncfile} realm1 key realm1key
|
||||
iniset ${csyncfile} realm1 cluster_name1 "$SWIFT_SERVICE_PROTOCOL://$SERVICE_HOST:8080/v1/"
|
||||
iniset ${csyncfile} realm1 cluster_name1 "http://$SERVICE_HOST:8080/v1/"
|
||||
|
||||
iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} DEFAULT user
|
||||
iniset ${SWIFT_CONFIG_PROXY_SERVER} DEFAULT user ${STACK_USER}
|
||||
|
||||
Reference in New Issue
Block a user