1 files changed, 21 insertions, 29 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
index e79a6a4..49aa530 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
@@ -24,7 +24,7 @@ PV = "8.0.0+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
-inherit setuptools update-rc.d identity hosts default_configs openstackchef monitor
+inherit setuptools update-rc.d identity hosts default_configs monitor
 
 SERVICE_TOKEN = "password"
 TOKEN_FORMAT ?= "PKI"
@@ -114,28 +114,26 @@ do_install_append() {
         admin_endpoint = http://%CONTROLLER_IP%:8081/keystone/admin/ " \
         -i ${KEYSTONE_CONF_DIR}/keystone.conf
     
-    if [ -z "${OPENSTACKCHEF_ENABLED}" ]; then
-        sed -e "s:%SERVICE_TOKEN%:${SERVICE_TOKEN}:g" \
-            -i ${KEYSTONE_CONF_DIR}/keystone.conf
-        sed -e "s:%DB_USER%:${DB_USER}:g" -i ${KEYSTONE_CONF_DIR}/keystone.conf
-        sed -e "s:%DB_PASSWORD%:${DB_PASSWORD}:g" \
-            -i ${KEYSTONE_CONF_DIR}/keystone.conf
-
-        sed -e "s:%CONTROLLER_IP%:${CONTROLLER_IP}:g" \
-            -i ${KEYSTONE_CONF_DIR}/keystone.conf
-        sed -e "s:%CONTROLLER_IP%:${CONTROLLER_IP}:g" \
-            -i ${KEYSTONE_CONF_DIR}/identity.sh
-
-        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
-    fi    
+    sed -e "s:%SERVICE_TOKEN%:${SERVICE_TOKEN}:g" \
+        -i ${KEYSTONE_CONF_DIR}/keystone.conf
+    sed -e "s:%DB_USER%:${DB_USER}:g" -i ${KEYSTONE_CONF_DIR}/keystone.conf
+    sed -e "s:%DB_PASSWORD%:${DB_PASSWORD}:g" \
+        -i ${KEYSTONE_CONF_DIR}/keystone.conf
+
+    sed -e "s:%CONTROLLER_IP%:${CONTROLLER_IP}:g" \
+        -i ${KEYSTONE_CONF_DIR}/keystone.conf
+    sed -e "s:%CONTROLLER_IP%:${CONTROLLER_IP}:g" \
+        -i ${KEYSTONE_CONF_DIR}/identity.sh
+
+    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
 
@@ -189,12 +187,6 @@ role_tree_dn = ou=Roles,${LDAP_DN} \
     fi
 }
 
-CHEF_SERVICES_CONF_FILES := "\
-    ${sysconfdir}/${SRCNAME}/keystone.conf \
-    ${sysconfdir}/${SRCNAME}/identity.sh \
-    ${sysconfdir}/init.d/keystone \
-    "
-
 pkg_postinst_${SRCNAME}-setup () {
     # python-keystone postinst start
     if [ "x$D" != "x" ]; then