swift: separate proxy server config

There are many changes required for proxy-server
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>

1 files changed, 7 insertions, 2 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-swift_git.bb b/meta-openstack/recipes-devtools/python/python-swift_git.bb
index 50e4839..9370670 100644
--- a/meta-openstack/recipes-devtools/python/python-swift_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-swift_git.bb
@@ -8,13 +8,14 @@ PR = "r0"
 SRCNAME = "swift"
 
 SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \
+           file://proxy-server.conf \
 "
 
 SRCREV="2f3526c559fe53ce904b735a81dee6de46127176"
 PV="2013.2.2+git${SRCPV}"
 S = "${WORKDIR}/git"
 
-inherit setuptools hosts
+inherit setuptools hosts identity
 
 do_install_append() {
     SWIFT_CONF_DIR=${D}${sysconfdir}/swift
@@ -22,7 +23,7 @@ do_install_append() {
     install -d ${SWIFT_CONF_DIR}
 
     install -m 600 ${S}/etc/swift.conf-sample ${SWIFT_CONF_DIR}/swift.conf
-    install -m 600 ${S}/etc/proxy-server.conf-sample ${SWIFT_CONF_DIR}/proxy-server.conf
+    install -m 600 ${WORKDIR}/proxy-server.conf ${SWIFT_CONF_DIR}/proxy-server.conf
     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
@@ -44,6 +45,10 @@ do_install_append() {
     sed 's/^# swift_dir =.*/swift_dir = \/etc\/swift/' -i ${SWIFT_CONF_DIR}/object-server.conf
     sed 's/^# devices =.*/devices = \/etc\/swift\/node/' -i ${SWIFT_CONF_DIR}/object-server.conf
     sed 's/^# mount_check =.*/mount_check = false/' -i ${SWIFT_CONF_DIR}/object-server.conf
+
+    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
 }
 
 PACKAGES += "${SRCNAME}"