From ada7b80b4f01cbcdd29cd00ed9e5b255de292d35 Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Tue, 8 Aug 2017 10:47:21 +0200 Subject: python-keystone: Fix sed failure due to missing init.d init.d folder is created only if sysV is enabled in the image, but its contents are accessed regardless. Move the seds under the same if clause. Signed-off-by: Adrian Dudau --- .../recipes-devtools/python/python-keystone_git.bb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'meta-openstack/recipes-devtools/python/python-keystone_git.bb') diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb index 15ecb84..91707ad 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb @@ -104,7 +104,14 @@ do_install_append() { then install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/keystone ${D}${sysconfdir}/init.d/keystone - fi + + sed -e "s/%ADMIN_PASSWORD%/${ADMIN_PASSWORD}/g" \ + -i ${D}${sysconfdir}/init.d/keystone + sed -e "s/%SERVICE_PASSWORD%/${SERVICE_PASSWORD}/g" \ + -i ${D}${sysconfdir}/init.d/keystone + sed -e "s/%SERVICE_TENANT_NAME%/${SERVICE_TENANT_NAME}/g" \ + -i ${D}${sysconfdir}/init.d/keystone + fi sed "/# admin_endpoint = .*/a \ public_endpoint = http://%CONTROLLER_IP%:8081/keystone/main/ " \ @@ -128,13 +135,6 @@ do_install_append() { sed -e "s:%TOKEN_FORMAT%:${TOKEN_FORMAT}:g" \ -i ${KEYSTONE_CONF_DIR}/keystone.conf - sed -e "s/%ADMIN_PASSWORD%/${ADMIN_PASSWORD}/g" \ - -i ${D}${sysconfdir}/init.d/keystone - sed -e "s/%SERVICE_PASSWORD%/${SERVICE_PASSWORD}/g" \ - -i ${D}${sysconfdir}/init.d/keystone - sed -e "s/%SERVICE_TENANT_NAME%/${SERVICE_TENANT_NAME}/g" \ - -i ${D}${sysconfdir}/init.d/keystone - install -d ${KEYSTONE_PACKAGE_DIR}/tests/tmp if [ -e "${KEYSTONE_PACKAGE_DIR}/tests/test_overrides.conf" ];then -- cgit v1.2.3-54-g00ecf