1. devstack
  2. Commit 0547e4382460ba29dcf17ca1e6107229655ce2a8
Browse code

Enable Swift's newer feature of container-sync

Newer version of container-sync feature is introduced in Swift ver. 1.12.0.

The spec:
http://docs.openstack.org/developer/swift/overview_container_sync.html

Before this commit, Devstack does not configure any realm used in
container-sync, therefore this feature does not work.
To test this feature in CI system, moreover to show the sample
configuration of realms, Devstack now edits realms configuration file.

Change-Id: I9f1e3224403e08e725a989162729470357fe90b0
Closes-Bug: 1378646
(cherry picked from commit d03915f9c08ff91c5d39f8cadb064718079bdb4b)

Daisuke Morita authored on 2014/10/08 15:52:21
Showing 1 changed files
lib/swift
History View file @ 0547e43
... ... 
@@ -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}