From bd2525ceb47699747f9370773fa629bf28c999d6 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Wed, 21 Dec 2016 10:22:41 -0500 Subject: housekeeping: replace deprecated base_contains Fixes: base_contains is deprecated, please use bb.utils.contains instead. Signed-off-by: Mark Asselstine Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-devtools/python/python-neutron_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 cadc80f..f651a8f 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb @@ -82,7 +82,7 @@ do_install_append() { PLUGIN=openvswitch ARGS="--config-file=${sysconfdir}/${SRCNAME}/neutron.conf --config-file=${sysconfdir}/${SRCNAME}/plugins/ml2/ml2_conf.ini" - if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/init.d sed "s:@plugin@:/etc/neutron/plugins/ml2/ml2_conf.ini:" \ < ${WORKDIR}/neutron-server.init >${WORKDIR}/neutron-server.init.sh @@ -93,7 +93,7 @@ do_install_append() { AGENT=dhcp ARGS="--config-file=${sysconfdir}/${SRCNAME}/neutron.conf --config-file=${sysconfdir}/${SRCNAME}/dhcp_agent.ini" - if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then 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}/ @@ -104,7 +104,7 @@ do_install_append() { AGENT=l3 ARGS="--config-file=${sysconfdir}/${SRCNAME}/neutron.conf --config-file=${sysconfdir}/${SRCNAME}/l3_agent.ini" - if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then 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}/ @@ -112,7 +112,7 @@ do_install_append() { AGENT=metadata ARGS="--config-file=${sysconfdir}/${SRCNAME}/neutron.conf --config-file=${sysconfdir}/${SRCNAME}/metadata_agent.ini" - if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then 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}/ -- cgit v1.2.3-54-g00ecf