swift: separate dispersion config

There are many changes required for proxy-dispersion
config file.  So instead of having sed to replace
all little details, it's cleaner to add new config
file that contains the changes

Signed-off-by: Vu Tran <vu.tran@windriver.com>

2 files changed, 23 insertions, 0 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-swift/dispersion.conf b/meta-openstack/recipes-devtools/python/python-swift/dispersion.conf
new file mode 100644
index 0000000..25119ff
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-swift/dispersion.conf
@@ -0,0 +1,17 @@
+[dispersion]
+auth_url = http://localhost:5000/v2.0/
+auth_user = %SERVICE_TENANT_NAME%:%SERVICE_USER%
+auth_key = %SERVICE_PASSWORD%
+auth_version = 2.0
+endpoint_type = publicURL
+keystone_api_insecure = no
+
+swift_dir = /etc/swift
+# dispersion_coverage = 1.0
+# retries = 5
+# concurrency = 25
+container_populate = yes
+object_populate = yes
+container_report = yes
+object_report = yes
+# dump_json = no
diff --git a/meta-openstack/recipes-devtools/python/python-swift_git.bb b/meta-openstack/recipes-devtools/python/python-swift_git.bb
index 9370670..d3419c5 100644
--- a/meta-openstack/recipes-devtools/python/python-swift_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-swift_git.bb
@@ -9,6 +9,7 @@ SRCNAME = "swift"
 
 SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \
            file://proxy-server.conf \
+           file://dispersion.conf \
 "
 
 SRCREV="2f3526c559fe53ce904b735a81dee6de46127176"
@@ -27,6 +28,7 @@ do_install_append() {
     install -m 600 ${S}/etc/account-server.conf-sample ${SWIFT_CONF_DIR}/account-server.conf
     install -m 600 ${S}/etc/container-server.conf-sample ${SWIFT_CONF_DIR}/container-server.conf
     install -m 600 ${S}/etc/object-server.conf-sample ${SWIFT_CONF_DIR}/object-server.conf
+    install -m 600 ${WORKDIR}/dispersion.conf ${SWIFT_CONF_DIR}/dispersion.conf
 
     sed 's/^# bind_port =.*/bind_port = 6002/' -i ${SWIFT_CONF_DIR}/account-server.conf
     sed 's/^# user =.*/user = root/' -i ${SWIFT_CONF_DIR}/account-server.conf
@@ -49,6 +51,10 @@ do_install_append() {
     sed "s/%SERVICE_TENANT_NAME%/${SERVICE_TENANT_NAME}/g" -i ${SWIFT_CONF_DIR}/proxy-server.conf
     sed "s/%SERVICE_USER%/${SRCNAME}/g" -i ${SWIFT_CONF_DIR}/proxy-server.conf
     sed "s/%SERVICE_PASSWORD%/${SERVICE_PASSWORD}/g" -i ${SWIFT_CONF_DIR}/proxy-server.conf
+
+    sed "s/%SERVICE_TENANT_NAME%/${SERVICE_TENANT_NAME}/g" -i ${SWIFT_CONF_DIR}/dispersion.conf
+    sed "s/%SERVICE_USER%/${SRCNAME}/g" -i ${SWIFT_CONF_DIR}/dispersion.conf
+    sed "s/%SERVICE_PASSWORD%/${SERVICE_PASSWORD}/g" -i ${SWIFT_CONF_DIR}/dispersion.conf
 }
 
 PACKAGES += "${SRCNAME}"