keystone:

keystone: move initscript install to before fixups

There are sed operations being performed on the sysvinit script .. but the
script wasn't being installed until after that block of code. We relocate
the install of the script to above any fixups, and everything works again.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
index 5e7fca1..8105d6f 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
@@ -97,6 +97,12 @@ do_install_append() {
         ${KEYSTONE_CGI_DIR}/main
 
     cp -r ${S}/examples ${KEYSTONE_PACKAGE_DIR}
+
+    if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)};
+    then
+        install -d ${D}${sysconfdir}/init.d
+        install -m 0755 ${WORKDIR}/keystone ${D}${sysconfdir}/init.d/keystone
+    fi
     
     if [ -z "${OPENSTACKCHEF_ENABLED}" ]; then
         sed -e "s:%SERVICE_TOKEN%:${SERVICE_TOKEN}:g" \
@@ -129,12 +135,6 @@ do_install_append() {
         admin_endpoint = http://%CONTROLLER_IP%:8081/keystone/admin/ " \
         -i ${KEYSTONE_CONF_DIR}/keystone.conf
 
-    if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)};
-    then
-        install -d ${D}${sysconfdir}/init.d
-        install -m 0755 ${WORKDIR}/keystone ${D}${sysconfdir}/init.d/keystone
-    fi
-
     install -d ${KEYSTONE_PACKAGE_DIR}/tests/tmp
 
     if [ -e "${KEYSTONE_PACKAGE_DIR}/tests/test_overrides.conf" ];then