From 0d6067258d09fdd47c95828e5e0e9b0f9987a529 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Mon, 9 Jan 2017 10:04:10 -0500 Subject: chef: remove the use of chef The use of chef was never complete, had isses with updating binary database files and had a cumbersome implementation. Since we are using Ansible in meta-overc we are dropping the use of chef here and will look to being at par with meta-overc by using Ansible if/when we get time to look at runtime configuration in meta-cloud-services. Signed-off-by: Mark Asselstine Signed-off-by: Bruce Ashfield --- .../recipes-extended/cloud-init/cloud-init_0.7.6.bb | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb') diff --git a/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb b/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb index 01ee924..c6b3529 100644 --- a/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb +++ b/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb @@ -28,19 +28,15 @@ do_install_prepend() { do_install_append() { install -m 0755 ${WORKDIR}/cloud.cfg ${D}${sysconfdir}/cloud/cloud.cfg - if [ -z "${OPENSTACKCHEF_ENABLED}" ]; then - sed -e "s:%MANAGE_HOSTS%:${MANAGE_HOSTS}:g" -i ${D}${sysconfdir}/cloud/cloud.cfg - sed -e "s:%HOSTNAME%:${HOSTNAME}:g" -i ${D}${sysconfdir}/cloud/cloud.cfg - fi + + sed -e "s:%MANAGE_HOSTS%:${MANAGE_HOSTS}:g" -i ${D}${sysconfdir}/cloud/cloud.cfg + sed -e "s:%HOSTNAME%:${HOSTNAME}:g" -i ${D}${sysconfdir}/cloud/cloud.cfg + ln -s ${libdir}/${BPN}/uncloud-init ${D}${sysconfdir}/cloud/uncloud-init ln -s ${libdir}/${BPN}/write-ssh-key-fingerprints ${D}${sysconfdir}/cloud/write-ssh-key-fingerprints } -inherit setuptools update-rc.d openstackchef - -CHEF_SERVICES_CONF_FILES := " \ - ${sysconfdir}/cloud/cloud.cfg \ - " +inherit setuptools update-rc.d PACKAGES += "${PN}-systemd" -- cgit v1.2.3-54-g00ecf