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-devtools/python/python-neutron_git.bb | 28 ++++------------------ 1 file changed, 5 insertions(+), 23 deletions(-) (limited to 'meta-openstack/recipes-devtools/python/python-neutron_git.bb') diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb index f651a8f..51c2ac4 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb @@ -24,7 +24,7 @@ PV = "7.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 SERVICECREATE_PACKAGES = "${SRCNAME}-setup" KEYSTONE_HOST="${CONTROLLER_IP}" @@ -117,8 +117,8 @@ do_install_append() { install -m 0755 ${WORKDIR}/neutron-$AGENT.init.sh ${D}${sysconfdir}/init.d/neutron-$AGENT-agent install -m 600 ${WORKDIR}/${AGENT}_agent.ini ${NEUTRON_CONF_DIR}/ fi - if [ -z "${OPENSTACKCHEF_ENABLED}" ]; then - for file in plugins/ml2/ml2_conf.ini neutron.conf metadata_agent.ini; do + + for file in plugins/ml2/ml2_conf.ini neutron.conf metadata_agent.ini; do sed -e "s:%SERVICE_TENANT_NAME%:${SERVICE_TENANT_NAME}:g" -i ${NEUTRON_CONF_DIR}/$file sed -e "s:%SERVICE_USER%:${SRCNAME}:g" -i ${NEUTRON_CONF_DIR}/$file sed -e "s:%SERVICE_PASSWORD%:${SERVICE_PASSWORD}:g" -i ${NEUTRON_CONF_DIR}/$file @@ -127,8 +127,8 @@ do_install_append() { sed -e "s:%DB_PASSWORD%:${DB_PASSWORD}:g" -i ${NEUTRON_CONF_DIR}/$file sed -e "s:%CONTROLLER_IP%:${CONTROLLER_IP}:g" -i ${NEUTRON_CONF_DIR}/$file sed -e "s:%CONTROLLER_HOST%:${CONTROLLER_HOST}:g" -i ${NEUTRON_CONF_DIR}/$file - done - fi + done + sed -e "s:^auth_host.*:#auth_host:g" -i ${NEUTRON_CONF_DIR}/neutron.conf sed -e "s:^auth_port.*:#auth_port:g" -i ${NEUTRON_CONF_DIR}/neutron.conf sed -e "s:^auth_protocol.*:#auth_protocol:g" -i ${NEUTRON_CONF_DIR}/neutron.conf @@ -154,24 +154,6 @@ pkg_postinst_${SRCNAME}-setup () { --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head } -CHEF_SERVICES_CONF_FILES := " \ - ${sysconfdir}/${SRCNAME}/neutron.conf \ - ${sysconfdir}/${SRCNAME}/metadata_agent.ini \ - ${sysconfdir}/${SRCNAME}/plugins/ml2/ml2_conf.ini \ - " -deploychef_services_special_func(){ - #This function is a callback function for the deploychef .bbclass - #We define this special callback funtion because we are doing - #more than a placeholder substitution. The variable CHEF_SERVICES_FILE_NAME - #is defined in deploychef_framework.bbclass - if [ -n "${CHEF_SERVICES_FILE_NAME}" ]; then - sed "s:^# rabbit_host =.*:rabbit_host = %CONTROLLER_IP%:" -i \ - ${CHEF_SERVICES_FILE_NAME} - fi -} - -CHEF_SERVICES_SPECIAL_FUNC := "deploychef_services_special_func" - pkg_postinst_${SRCNAME}-plugin-openvswitch-setup () { if [ "x$D" != "x" ]; then exit 1 -- cgit v1.2.3-54-g00ecf