Browse code

Merge "Enable Swift's newer feature of container-sync" into stable/icehouse

Jenkins authored on 2014/10/31 20:23:21
Showing 1 changed files
... ...
@@ -308,7 +308,12 @@ function configure_swift {
308 308
     SWIFT_CONFIG_PROXY_SERVER=${SWIFT_CONF_DIR}/proxy-server.conf
309 309
     cp ${SWIFT_DIR}/etc/proxy-server.conf-sample ${SWIFT_CONFIG_PROXY_SERVER}
310 310
 
311
-    cp ${SWIFT_DIR}/etc/container-sync-realms.conf-sample ${SWIFT_CONF_DIR}/container-sync-realms.conf
311
+    # To run container sync feature introduced in Swift ver 1.12.0,
312
+    # container sync "realm" is added in container-sync-realms.conf
313
+    local csyncfile=${SWIFT_CONF_DIR}/container-sync-realms.conf
314
+    cp ${SWIFT_DIR}/etc/container-sync-realms.conf-sample ${csyncfile}
315
+    iniset ${csyncfile} realm1 key realm1key
316
+    iniset ${csyncfile} realm1 cluster_name1 "$SWIFT_SERVICE_PROTOCOL://$SERVICE_HOST:8080/v1/"
312 317
 
313 318
     iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} DEFAULT user
314 319
     iniset ${SWIFT_CONFIG_PROXY_SERVER} DEFAULT user ${STACK_USER}