commit 9b4fe5d0ce6ad98fac0fde11d93e928ba0e81d8e
author Jenkins <jenkins@review.openstack.org> Fri Jan 31 17:06:38 2014 +0000
committer Gerrit Code Review <review@openstack.org> Fri Jan 31 17:06:38 2014 +0000
tree 9f2f4011334c9bbdef793ec66bd2c3722dd7a03e
parent 465653e25f0379891c30c5ef2eb8ed8c286f972a
parent f2c1a712e82ac1d347b0fb6526c79471a9ef8d55

Merge "Copy container-sync-realms.conf in /etc/swift"

lib/swift

diff --git a/lib/swift b/lib/swift
index afdf995..54d6f1c 100644
--- a/lib/swift
+++ b/lib/swift
@@ -261,6 +261,8 @@
     SWIFT_CONFIG_PROXY_SERVER=${SWIFT_CONF_DIR}/proxy-server.conf
     cp ${SWIFT_DIR}/etc/proxy-server.conf-sample ${SWIFT_CONFIG_PROXY_SERVER}
 
+    cp ${SWIFT_DIR}/etc/container-sync-realms.conf-sample ${SWIFT_CONF_DIR}/container-sync-realms.conf
+
     iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} DEFAULT user
     iniset ${SWIFT_CONFIG_PROXY_SERVER} DEFAULT user ${STACK_USER}