diff options
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-swift_git.bb')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-swift_git.bb | 6 |
1 files changed, 6 insertions, 0 deletions
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" | |||
| 9 | 9 | ||
| 10 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \ | 10 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \ |
| 11 | file://proxy-server.conf \ | 11 | file://proxy-server.conf \ |
| 12 | file://dispersion.conf \ | ||
| 12 | " | 13 | " |
| 13 | 14 | ||
| 14 | SRCREV="2f3526c559fe53ce904b735a81dee6de46127176" | 15 | SRCREV="2f3526c559fe53ce904b735a81dee6de46127176" |
| @@ -27,6 +28,7 @@ do_install_append() { | |||
| 27 | install -m 600 ${S}/etc/account-server.conf-sample ${SWIFT_CONF_DIR}/account-server.conf | 28 | install -m 600 ${S}/etc/account-server.conf-sample ${SWIFT_CONF_DIR}/account-server.conf |
| 28 | install -m 600 ${S}/etc/container-server.conf-sample ${SWIFT_CONF_DIR}/container-server.conf | 29 | install -m 600 ${S}/etc/container-server.conf-sample ${SWIFT_CONF_DIR}/container-server.conf |
| 29 | install -m 600 ${S}/etc/object-server.conf-sample ${SWIFT_CONF_DIR}/object-server.conf | 30 | install -m 600 ${S}/etc/object-server.conf-sample ${SWIFT_CONF_DIR}/object-server.conf |
| 31 | install -m 600 ${WORKDIR}/dispersion.conf ${SWIFT_CONF_DIR}/dispersion.conf | ||
| 30 | 32 | ||
| 31 | sed 's/^# bind_port =.*/bind_port = 6002/' -i ${SWIFT_CONF_DIR}/account-server.conf | 33 | sed 's/^# bind_port =.*/bind_port = 6002/' -i ${SWIFT_CONF_DIR}/account-server.conf |
| 32 | sed 's/^# user =.*/user = root/' -i ${SWIFT_CONF_DIR}/account-server.conf | 34 | sed 's/^# user =.*/user = root/' -i ${SWIFT_CONF_DIR}/account-server.conf |
| @@ -49,6 +51,10 @@ do_install_append() { | |||
| 49 | sed "s/%SERVICE_TENANT_NAME%/${SERVICE_TENANT_NAME}/g" -i ${SWIFT_CONF_DIR}/proxy-server.conf | 51 | sed "s/%SERVICE_TENANT_NAME%/${SERVICE_TENANT_NAME}/g" -i ${SWIFT_CONF_DIR}/proxy-server.conf |
| 50 | sed "s/%SERVICE_USER%/${SRCNAME}/g" -i ${SWIFT_CONF_DIR}/proxy-server.conf | 52 | sed "s/%SERVICE_USER%/${SRCNAME}/g" -i ${SWIFT_CONF_DIR}/proxy-server.conf |
| 51 | sed "s/%SERVICE_PASSWORD%/${SERVICE_PASSWORD}/g" -i ${SWIFT_CONF_DIR}/proxy-server.conf | 53 | sed "s/%SERVICE_PASSWORD%/${SERVICE_PASSWORD}/g" -i ${SWIFT_CONF_DIR}/proxy-server.conf |
| 54 | |||
| 55 | sed "s/%SERVICE_TENANT_NAME%/${SERVICE_TENANT_NAME}/g" -i ${SWIFT_CONF_DIR}/dispersion.conf | ||
| 56 | sed "s/%SERVICE_USER%/${SRCNAME}/g" -i ${SWIFT_CONF_DIR}/dispersion.conf | ||
| 57 | sed "s/%SERVICE_PASSWORD%/${SERVICE_PASSWORD}/g" -i ${SWIFT_CONF_DIR}/dispersion.conf | ||
| 52 | } | 58 | } |
| 53 | 59 | ||
| 54 | PACKAGES += "${SRCNAME}" | 60 | PACKAGES += "${SRCNAME}" |
