summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/python/python-neutron_git.bb
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-neutron_git.bb')
-rw-r--r--meta-openstack/recipes-devtools/python/python-neutron_git.bb5
1 files changed, 0 insertions, 5 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
index 11dbb84..7229e47 100644
--- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
@@ -30,8 +30,6 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol
30SRCREV = "7fd30cb652fb5d516b4c1f5415f18f54d7a40c2a" 30SRCREV = "7fd30cb652fb5d516b4c1f5415f18f54d7a40c2a"
31PV = "11.0.2+git${SRCPV}" 31PV = "11.0.2+git${SRCPV}"
32 32
33S = "${WORKDIR}/git"
34
35inherit setuptools3 systemd useradd identity hosts default_configs monitor 33inherit setuptools3 systemd useradd identity hosts default_configs monitor
36 34
37USER = "neutron" 35USER = "neutron"
@@ -106,7 +104,6 @@ do_install:append() {
106 sed -e "/^#connection = .*/aconnection = postgresql+psycopg2://${DB_USER}:${DB_PASSWORD}@localhost/neutron" \ 104 sed -e "/^#connection = .*/aconnection = postgresql+psycopg2://${DB_USER}:${DB_PASSWORD}@localhost/neutron" \
107 -i ${CONF_FILE} 105 -i ${CONF_FILE}
108 106
109
110 # ml2_conf.ini changes (replace with .ini file editing) 107 # ml2_conf.ini changes (replace with .ini file editing)
111 CONF_FILE=${NEUTRON_CONF_DIR}/plugins/ml2/ml2_conf.ini 108 CONF_FILE=${NEUTRON_CONF_DIR}/plugins/ml2/ml2_conf.ini
112 sed -e "/#type_drivers =/atype_drivers = flat,vlan" -i ${CONF_FILE} 109 sed -e "/#type_drivers =/atype_drivers = flat,vlan" -i ${CONF_FILE}
@@ -262,7 +259,6 @@ FILES:${PN} = "${libdir}/*"
262FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh" 259FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh"
263RDEPENDS:${SRCNAME}-tests += " bash" 260RDEPENDS:${SRCNAME}-tests += " bash"
264 261
265
266FILES:${SRCNAME} = " \ 262FILES:${SRCNAME} = " \
267 ${bindir}/neutron-db-manage \ 263 ${bindir}/neutron-db-manage \
268 ${bindir}/neutron-rootwrap \ 264 ${bindir}/neutron-rootwrap \
@@ -429,6 +425,5 @@ SYSTEMD_AUTO_ENABLE:${SRCNAME}-dhcp-agent = "disable"
429SYSTEMD_AUTO_ENABLE:${SRCNAME}-linuxbridge-agent = "disable" 425SYSTEMD_AUTO_ENABLE:${SRCNAME}-linuxbridge-agent = "disable"
430SYSTEMD_AUTO_ENABLE:${SRCNAME}-metadata-agent = "disable" 426SYSTEMD_AUTO_ENABLE:${SRCNAME}-metadata-agent = "disable"
431 427
432
433MONITOR_SERVICE_PACKAGES = "${SRCNAME}" 428MONITOR_SERVICE_PACKAGES = "${SRCNAME}"
434MONITOR_SERVICE_${SRCNAME} = "neutron" 429MONITOR_SERVICE_${SRCNAME} = "neutron"