Browse code

Merge "Enable Swift's newer feature of container-sync"

Jenkins authored on 2014/10/28 12:16:21
Showing 1 changed files
... ...
@@ -330,7 +330,12 @@ function configure_swift {
330 330
     SWIFT_CONFIG_PROXY_SERVER=${SWIFT_CONF_DIR}/proxy-server.conf
331 331
     cp ${SWIFT_DIR}/etc/proxy-server.conf-sample ${SWIFT_CONFIG_PROXY_SERVER}
332 332
 
333
-    cp ${SWIFT_DIR}/etc/container-sync-realms.conf-sample ${SWIFT_CONF_DIR}/container-sync-realms.conf
333
+    # To run container sync feature introduced in Swift ver 1.12.0,
334
+    # container sync "realm" is added in container-sync-realms.conf
335
+    local csyncfile=${SWIFT_CONF_DIR}/container-sync-realms.conf
336
+    cp ${SWIFT_DIR}/etc/container-sync-realms.conf-sample ${csyncfile}
337
+    iniset ${csyncfile} realm1 key realm1key
338
+    iniset ${csyncfile} realm1 cluster_name1 "$SWIFT_SERVICE_PROTOCOL://$SERVICE_HOST:8080/v1/"
334 339
 
335 340
     iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} DEFAULT user
336 341
     iniset ${SWIFT_CONFIG_PROXY_SERVER} DEFAULT user ${STACK_USER}