From 1615d72e2927619321c353c1ff792ed3352e73a9 Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Tue, 8 Aug 2017 11:29:37 +0200 Subject: python-neutron: Fix sed error due to missing metadata_agent.ini metadata_agent.ini is installed only if sysV is present, so use a dummy variable to avoid sed-ing it if not installed. Signed-off-by: Adrian Dudau --- meta-openstack/recipes-devtools/python/python-neutron_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 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 56fa4e6..70b59b1 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb @@ -52,7 +52,6 @@ do_install_append() { install -d ${NEUTRON_CONF_DIR}/plugins/ml2 install -m 600 ${TEMPLATE_CONF_DIR}/neutron.conf ${NEUTRON_CONF_DIR}/ - #touch ${NEUTRON_CONF_DIR}/neutron.conf install -m 600 ${S}/etc/api-paste.ini ${NEUTRON_CONF_DIR}/ install -m 600 ${S}/etc/policy.json ${NEUTRON_CONF_DIR}/ install -m 600 ${TEMPLATE_CONF_DIR}/ml2* ${NEUTRON_CONF_DIR}/plugins/ml2 @@ -116,9 +115,10 @@ do_install_append() { sed "s:@suffix@:$AGENT:;s:@args@:$ARGS:" < ${WORKDIR}/neutron-agent.init >${WORKDIR}/neutron-$AGENT.init.sh 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}/ + metadataagentini = "metadata_agent.ini" fi - for file in plugins/ml2/ml2_conf.ini neutron.conf metadata_agent.ini; do + for file in plugins/ml2/ml2_conf.ini neutron.conf ${metadataagentini}; 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 -- cgit v1.2.3-54-g00ecf