1 files changed, 233 insertions, 116 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
index f2a4baa..edf9096 100644
--- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
@@ -6,25 +6,40 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
 SRCNAME = "neutron"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
-           file://neutron-server.init \
-           file://neutron-agent.init \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike \
+           file://neutron-server.service \
+           file://neutron.conf \
            file://l3_agent.ini \
            file://dhcp_agent.ini \
            file://metadata_agent.ini \
+           file://metering_agent.ini \
+           file://ml2/linuxbridge_agent.ini.sample \
+           file://ml2/macvtap_agent.ini.sample \
+           file://ml2/ml2_conf.ini.sample \
+           file://ml2/openvswitch_agent.ini.sample \
+           file://ml2/sriov_agent.ini.sample \
+           file://neutron-dhcp-agent.service \
+           file://neutron-linuxbridge-agent.service \
+           file://neutron-metadata-agent.service \
+           file://neutron-init.service \
+           file://neutron-init \
+           file://neutron_sudoers \
            file://neutron-dhcp-agent-netns-cleanup.cron \
-           file://0001-neutron.conf-jumpstart-nova-state-reporting-configur.patch \
           "
 
-# TBD: update or drop
-# file://uuid_wscheck.patch
-
-SRCREV = "6dcfe3a9362ae5fcf18e5cfb59663e43446cd59c"
-PV = "7.0.0+git${SRCPV}"
+SRCREV = "7fd30cb652fb5d516b4c1f5415f18f54d7a40c2a"
+PV = "11.0.2+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
-inherit setuptools update-rc.d identity hosts default_configs monitor
+inherit setuptools systemd useradd identity hosts default_configs monitor
+
+USER = "neutron"
+GROUP = "neutron"
+
+USERADD_PACKAGES = "${PN}"
+GROUPADD_PARAM_${PN} = "--system ${GROUP}"
+USERADD_PARAM_${PN} = "--system -m -d ${localstatedir}/lib/neutron -s /bin/false -g ${GROUP} ${USER}"
 
 SERVICECREATE_PACKAGES = "${SRCNAME}-setup"
 KEYSTONE_HOST="${CONTROLLER_IP}"
@@ -49,93 +64,154 @@ do_install_append() {
     TEMPLATE_CONF_DIR=${S}${sysconfdir}/
     NEUTRON_CONF_DIR=${D}${sysconfdir}/neutron
 
-    install -d ${NEUTRON_CONF_DIR}
-    install -d ${NEUTRON_CONF_DIR}/plugins/ml2
+    install -d -g ${GROUP} -m 750 ${NEUTRON_CONF_DIR}
+    install -d -g ${GROUP} -m 750 ${NEUTRON_CONF_DIR}/plugins
+    install -d -g ${GROUP} -m 750 ${NEUTRON_CONF_DIR}/plugins/ml2
 
-    install -m 600 ${TEMPLATE_CONF_DIR}/neutron.conf ${NEUTRON_CONF_DIR}/
-    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}/neutron/plugins/ml2/* ${NEUTRON_CONF_DIR}/plugins/ml2
-    install -m 600 ${WORKDIR}/metadata_agent.ini ${NEUTRON_CONF_DIR}/
+    # Available directly from source
+    install -m 640 -g ${GROUP} ${S}/etc/api-paste.ini ${NEUTRON_CONF_DIR}/
+    install -m 640 -g ${GROUP} ${S}/etc/policy.json ${NEUTRON_CONF_DIR}/
 
-    # Neutron.conf config changes (replace with .ini file editing)
-    sed -e "s:^# core_plugin.*:core_plugin = ml2:g" -i ${NEUTRON_CONF_DIR}/neutron.conf
-    sed -e "s:^# service_plugins =.*:service_plugins = router:g" -i ${NEUTRON_CONF_DIR}/neutron.conf
-    sed -e "s:^# allow_overlapping_ips = False:allow_overlapping_ips = True:g" -i ${NEUTRON_CONF_DIR}/neutron.conf
+    # Generated using ./tools/generate_config_file_samples.sh
+    install -m 640 -g ${GROUP} ${WORKDIR}/neutron.conf ${NEUTRON_CONF_DIR}/
+    install -m 640 -g ${GROUP} ${WORKDIR}/dhcp_agent.ini ${NEUTRON_CONF_DIR}/
+    install -m 640 -g ${GROUP} ${WORKDIR}/metadata_agent.ini ${NEUTRON_CONF_DIR}/
+    install -m 640 -g ${GROUP} ${WORKDIR}/metering_agent.ini ${NEUTRON_CONF_DIR}/
 
-    # disable reporting of state changes to nova
-    sed -e "s:^# notify_nova_on_port_status_changes.*:notify_nova_on_port_status_changes = False:g" -i ${NEUTRON_CONF_DIR}/neutron.conf
-    sed -e "s:^# notify_nova_on_port_data_changes.*:notify_nova_on_port_data_changes = False:g" -i ${NEUTRON_CONF_DIR}/neutron.conf
-
-    sed -e "s:^# connection = sq.*:connection = postgresql\://${ADMIN_USER}\:${ADMIN_PASSWORD}@localhost/neutron:g" -i ${NEUTRON_CONF_DIR}/neutron.conf
-    sed -e "s:^#.*rabbit_host=.*:rabbit_host = %CONTROLLER_IP%:" -i ${NEUTRON_CONF_DIR}/neutron.conf
-
-    # ml2_conf.ini changes (replace with .ini file editing)
-    sed -e "s:^# type_drivers = .*:type_drivers = gre:g" -i ${NEUTRON_CONF_DIR}/plugins/ml2/ml2_conf.ini
-    sed -e "s:^# tenant_network_types = .*:tenant_network_types = gre:g" -i ${NEUTRON_CONF_DIR}/plugins/ml2/ml2_conf.ini
-    sed -e "s:^# mechanism_drivers =.*:mechanism_drivers = openvswitch:g" -i ${NEUTRON_CONF_DIR}/plugins/ml2/ml2_conf.ini
-    sed -e "s:^# tunnel_id_ranges =.*:tunnel_id_ranges = 1\:1000:g" -i ${NEUTRON_CONF_DIR}/plugins/ml2/ml2_conf.ini
-
-    echo "[ovs]" >> ${NEUTRON_CONF_DIR}/plugins/ml2/ml2_conf.ini
-    echo "local_ip = ${MY_IP}" >> ${NEUTRON_CONF_DIR}/plugins/ml2/ml2_conf.ini
-    echo "tunnel_type = gre" >> ${NEUTRON_CONF_DIR}/plugins/ml2/ml2_conf.ini
-    echo "enable_tunneling = True" >> ${NEUTRON_CONF_DIR}/plugins/ml2/ml2_conf.ini
-
-    PLUGIN=openvswitch
-    ARGS="--config-file=${sysconfdir}/${SRCNAME}/neutron.conf --config-file=${sysconfdir}/${SRCNAME}/plugins/ml2/ml2_conf.ini"
-    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
-        install -m 0755 ${WORKDIR}/neutron-server.init.sh ${D}${sysconfdir}/init.d/neutron-server
-        sed "s:@suffix@:$PLUGIN:;s:@args@:$ARGS:" < ${WORKDIR}/neutron-agent.init >${WORKDIR}/neutron-$PLUGIN.init.sh
-        install -m 0755 ${WORKDIR}/neutron-$PLUGIN.init.sh ${D}${sysconfdir}/init.d/neutron-$PLUGIN-agent
-    fi
-
-    AGENT=dhcp
-    ARGS="--config-file=${sysconfdir}/${SRCNAME}/neutron.conf --config-file=${sysconfdir}/${SRCNAME}/dhcp_agent.ini"
-    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}/
-        sed "s:@bindir@:${bindir}:g;s:@confdir@:${sysconfdir}:g" < ${WORKDIR}/neutron-dhcp-agent-netns-cleanup.cron >${WORKDIR}/neutron-dhcp-agent-netns-cleanup
-        install -d ${D}${sysconfdir}/cron.d
-        install -m 644 ${WORKDIR}/neutron-dhcp-agent-netns-cleanup ${D}${sysconfdir}/cron.d/
-    fi
+    # install ml2 plugin ini files (also generated using ./tools/generate_config_file_samples.sh)
+    for j in linuxbridge_agent macvtap_agent ml2_conf openvswitch_agent sriov_agent
+    do
+        install -m 640 -g ${GROUP} ${WORKDIR}/ml2/$j.ini.sample ${NEUTRON_CONF_DIR}/plugins/ml2/$j.ini
+    done
 
-    AGENT=l3
-    ARGS="--config-file=${sysconfdir}/${SRCNAME}/neutron.conf --config-file=${sysconfdir}/${SRCNAME}/l3_agent.ini"
-    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}/
-    fi
+    # Neutron.conf config changes (replace with .ini file editing)
+    CONF_FILE=${NEUTRON_CONF_DIR}/neutron.conf
+    sed -e "/#core_plugin =/acore_plugin = ml2" -i ${CONF_FILE}
+    sed -e "/#service_plugins =/aservice_plugins =" -i ${CONF_FILE}
+    sed -e "/#transport_url =/atransport_url = rabbit://openstack:${ADMIN_PASSWORD}@${CONTROLLER_IP}" -i ${CONF_FILE}
+    sed -e "/#auth_strategy =/aauth_strategy = keystone" -i ${CONF_FILE}
+    sed -e "/#root_helper =/aroot_helper = sudo ${bindir}/neutron-rootwrap ${sysconfdir}/neutron/rootwrap.conf" -i ${CONF_FILE}
+    
+    str="auth_uri = http://${CONTROLLER_IP}:5000"
+    str="$str\nauth_url = http://${CONTROLLER_IP}:35357"
+    str="$str\nmemcached_servers = ${CONTROLLER_IP}:11211"
+    str="$str\nauth_type = password"
+    str="$str\nproject_domain_name = Default"
+    str="$str\nuser_domain_name = Default"
+    str="$str\nproject_name = service"
+    str="$str\nusername = ${USER}"
+    str="$str\npassword = ${ADMIN_PASSWORD}"
+    sed -e "/^\[keystone_authtoken\].*/a$str" -i ${CONF_FILE}
+    
+    sed -e "/^#connection = .*/aconnection = postgresql+psycopg2://${DB_USER}:${DB_PASSWORD}@localhost/neutron" \
+            -i ${CONF_FILE}
 
-    AGENT=metadata
-    ARGS="--config-file=${sysconfdir}/${SRCNAME}/neutron.conf --config-file=${sysconfdir}/${SRCNAME}/metadata_agent.ini"
-    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}/
-    fi
 
-    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
-        sed -e "s:%METADATA_SHARED_SECRET%:${METADATA_SHARED_SECRET}:g" -i ${NEUTRON_CONF_DIR}/$file
-        sed -e "s:%DB_USER%:${DB_USER}:g" -i ${NEUTRON_CONF_DIR}/$file
-        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
+    # ml2_conf.ini changes (replace with .ini file editing)
+    CONF_FILE=${NEUTRON_CONF_DIR}/plugins/ml2/ml2_conf.ini
+    sed -e "/#type_drivers =/atype_drivers = flat,vlan" -i ${CONF_FILE} 
+    sed -e "/#tenant_network_types =/atenant_network_types =" -i ${CONF_FILE}
+    sed -e "/#mechanism_drivers =/amechanism_drivers = linuxbridge" -i ${CONF_FILE}
+    sed -e "/#extension_drivers =/aextension_drivers = port_security" -i ${CONF_FILE}
+    sed -e "/#flat_networks =/aflat_networks = provider" -i ${CONF_FILE}
+    sed -e "/#enable_ipset =/aenable_ipset = true" -i ${CONF_FILE}
+
+    # dhcp-agent
+    CONF_FILE=${NEUTRON_CONF_DIR}/dhcp_agent.ini
+    sed -e "/#interface_driver =/ainterface_driver = linuxbridge" -i ${CONF_FILE}
+    sed -e "/#dhcp_driver =/adhcp_driver = neutron.agent.linux.dhcp.Dnsmasq" -i ${CONF_FILE}
+    sed -e "/#enable_isolated_metadata =/aenable_isolated_metadata = true" -i ${CONF_FILE}
+    
+    install -d ${D}${sysconfdir}/cron.d
+    CRON_FILE=${D}${sysconfdir}/cron.d/neutron-dhcp-agent-netns-cleanup
+    install -m 644 ${WORKDIR}/neutron-dhcp-agent-netns-cleanup.cron ${CRON_FILE}
+    sed "s:@bindir@:${bindir}:g;s:@confdir@:${sysconfdir}:g" -i ${CRON_FILE}
+
+    # linuxbridge
+    CONF_FILE=${NEUTRON_CONF_DIR}/plugins/ml2/linuxbridge_agent.ini
+    sed -e "/#physical_interface_mappings =/aphysical_interface_mappings = provider:eth0" -i ${CONF_FILE}
+    sed -e "/#enable_vxlan/aenable_vxlan = false" -i ${CONF_FILE}
+    sed -e "/#enable_security_group =/aenable_security_group = true" -i ${CONF_FILE}
+    sed -e "/#firewall_driver =/afirewall_driver = neutron.agent.linux.iptables_firewall.IptablesFirewallDriver" -i ${CONF_FILE}
+
+    #PLUGIN=openvswitch
+    #ARGS="--config-file=${sysconfdir}/${SRCNAME}/neutron.conf --config-file=${sysconfdir}/${SRCNAME}/plugins/ml2/ml2_conf.ini"
+    #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
+    #    install -m 0755 ${WORKDIR}/neutron-server.init.sh ${D}${sysconfdir}/init.d/neutron-server
+    #    sed "s:@suffix@:$PLUGIN:;s:@args@:$ARGS:" < ${WORKDIR}/neutron-agent.init >${WORKDIR}/neutron-$PLUGIN.init.sh
+    #    install -m 0755 ${WORKDIR}/neutron-$PLUGIN.init.sh ${D}${sysconfdir}/init.d/neutron-$PLUGIN-agent
+    #fi
+    #
+    
+    #AGENT=l3
+    #ARGS="--config-file=${sysconfdir}/${SRCNAME}/neutron.conf --config-file=${sysconfdir}/${SRCNAME}/l3_agent.ini"
+    #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}/
+    #fi
+    #
+    #AGENT=metadata
+    #ARGS="--config-file=${sysconfdir}/${SRCNAME}/neutron.conf --config-file=${sysconfdir}/${SRCNAME}/metadata_agent.ini"
+    #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}/
+    #fi
+    #
+    #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
+    #    sed -e "s:%METADATA_SHARED_SECRET%:${METADATA_SHARED_SECRET}:g" -i ${NEUTRON_CONF_DIR}/$file
+    #    sed -e "s:%DB_USER%:${DB_USER}:g" -i ${NEUTRON_CONF_DIR}/$file
+    #    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
+    #
+    #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
+    #sed -i '/\[keystone_authtoken\]/aidentity_uri=http://127.0.0.1:8081/keystone/admin/' ${NEUTRON_CONF_DIR}/neutron.conf
+    #
+    #cp run_tests.sh ${NEUTRON_CONF_DIR}
+
+    # install systemd service files
+    install -d ${D}${systemd_system_unitdir}/
+    for j in neutron-server neutron-init neutron-dhcp-agent neutron-linuxbridge-agent neutron-metadata-agent
+    do
+        SERVICE_FILE=${D}${systemd_system_unitdir}/$j.service
+        install -m 644 ${WORKDIR}/$j.service ${SERVICE_FILE}
+        sed -e "s#%LOCALSTATEDIR%#${localstatedir}#g" -i ${SERVICE_FILE}
+        sed -e "s#%SYSCONFDIR%#${sysconfdir}#g" -i ${SERVICE_FILE}
     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
-    sed -i '/\[keystone_authtoken\]/aidentity_uri=http://127.0.0.1:8081/keystone/admin/' ${NEUTRON_CONF_DIR}/neutron.conf
-
-    cp run_tests.sh ${NEUTRON_CONF_DIR}
+    # Setup the neutron initialization script
+    INIT_FILE=${NEUTRON_CONF_DIR}/neutron-init
+    install -g ${USER} -m 750 ${WORKDIR}/neutron-init ${INIT_FILE}
+    sed -e "s:%DB_USER%:${DB_USER}:g" -i ${INIT_FILE}
+    sed -e "s:%NEUTRON_USER%:${USER}:g" -i ${INIT_FILE}
+    sed -e "s:%NEUTRON_GROUP%:${GROUP}:g" -i ${INIT_FILE}
+    sed -e "s:%CONTROLLER_IP%:${CONTROLLER_IP}:g" -i ${INIT_FILE}
+    sed -e "s:%ADMIN_USER%:${ADMIN_USER}:g" -i ${INIT_FILE}
+    sed -e "s:%ADMIN_PASSWORD%:${ADMIN_PASSWORD}:g" -i ${INIT_FILE}
+    sed -e "s:%ADMIN_ROLE%:${ADMIN_ROLE}:g" -i ${INIT_FILE}
+    sed -e "s:%SYSCONFDIR%:${sysconfdir}:g" -i ${INIT_FILE}
+    sed -e "s:%ROOT_HOME%:${ROOT_HOME}:g" -i ${INIT_FILE}
+
+    # setup sudo
+    SUDOERS_FILE=${D}${sysconfdir}/sudoers.d/neutron_sudoers
+    install -m 750 -d ${D}${sysconfdir}/sudoers.d
+    install ${WORKDIR}/neutron_sudoers ${SUDOERS_FILE}
+    sed -e "s:%USER%:${USER}:g" -i ${SUDOERS_FILE}
+
+    install -m 600 ${S}/etc/rootwrap.conf ${NEUTRON_CONF_DIR}/
+    install -m 750 -d ${NEUTRON_CONF_DIR}/rootwrap.d
+    install -m 600 ${S}/etc/neutron/rootwrap.d/* ${NEUTRON_CONF_DIR}/rootwrap.d/
 }
 
 pkg_postinst_${SRCNAME}-setup () {
@@ -172,8 +248,10 @@ PACKAGES += " \
      ${SRCNAME}-plugin-ml2 \
      ${SRCNAME}-ml2 \
      ${SRCNAME}-dhcp-agent \
+     ${SRCNAME}-linuxbridge-agent \
      ${SRCNAME}-l3-agent \
      ${SRCNAME}-metadata-agent \
+     ${SRCNAME}-metering-agent \
      ${SRCNAME}-extra-agents \
      ${SRCNAME}-setup \
      ${SRCNAME}-plugin-openvswitch-setup \
@@ -194,11 +272,15 @@ FILES_${SRCNAME} = " \
     ${sysconfdir}/${SRCNAME}/policy.json \
     ${sysconfdir}/${SRCNAME}/neutron.conf \
     ${sysconfdir}/${SRCNAME}/api-paste.ini \
+    ${sysconfdir}/sudoers.d/neutron_sudoers \
+    ${sysconfdir}/${SRCNAME}/rootwrap.d \
+    ${sysconfdir}/${SRCNAME}/rootwrap.conf \
     ${localstatedir}/* \    
     "
 
-FILES_${SRCNAME}-server = "${bindir}/neutron-server \
-    ${sysconfdir}/init.d/neutron-server \
+FILES_${SRCNAME}-server = " \
+    ${bindir}/neutron-server \
+    ${sysconfdir}/neutron/plugin.ini \
     "
 
 FILES_${SRCNAME}-plugin-ml2 = " \
@@ -210,28 +292,42 @@ FILES_${SRCNAME}-plugin-openvswitch = " \
     ${sysconfdir}/init.d/neutron-openvswitch-agent \
     "
 
-FILES_${SRCNAME}-dhcp-agent = "${bindir}/neutron-dhcp-agent \
+FILES_${SRCNAME}-dhcp-agent = " \
+    ${bindir}/neutron-dhcp-agent \
     ${bindir}/neutron-dhcp-agent-dnsmasq-lease-update \
     ${sysconfdir}/${SRCNAME}/dhcp_agent.ini \
-    ${sysconfdir}/init.d/neutron-dhcp-agent \
     ${sysconfdir}/cron.d/neutron-dhcp-agent-netns-cleanup \
     "
 
-FILES_${SRCNAME}-l3-agent = "${bindir}/neutron-l3-agent \
+FILES_${SRCNAME}-linuxbridge-agent = " \
+    ${bindir}/neutron-linuxbridge-agent \
+    ${sysconfdir}/${SRCNAME}/plugins/ml2/linuxbridge_agent.ini \
+    "
+
+FILES_${SRCNAME}-l3-agent = " \
+    ${bindir}/neutron-l3-agent \
     ${sysconfdir}/${SRCNAME}/l3_agent.ini \
-    ${sysconfdir}/init.d/neutron-l3-agent \
     "
 
-FILES_${SRCNAME}-metadata-agent = "${bindir}/neutron-metadata-agent \
+FILES_${SRCNAME}-metadata-agent = " \
+    ${bindir}/neutron-metadata-agent \
     ${bindir}/neutron-ns-metadata-proxy \
     ${sysconfdir}/${SRCNAME}/metadata_agent.ini \
-    ${sysconfdir}/init.d/neutron-metadata-agent \
+    "
+
+FILES_${SRCNAME}-metering-agent = " \
+    ${bindir}/neutron-metering-agent \
+    ${sysconfdir}/${SRCNAME}/metering_agent.ini \
     "
 
 FILES_${SRCNAME}-extra-agents = "${bindir}/*"
 
 FILES_${SRCNAME}-doc = "${datadir}/*"
 
+FILES_${SRCNAME}-setup = " \
+    ${sysconfdir}/neutron/neutron-init \
+    "
+
 DEPENDS += " \
         python-pip \
         python-pbr \
@@ -241,24 +337,26 @@ RDEPENDS_${PN} += " \
         python-pbr \
         python-paste \
         python-pastedeploy \
+        python-routes \
         python-debtcollector \
         python-eventlet \
         python-pecan \
-        python-greenlet \
         python-httplib2 \
-        python-requests \
         python-jinja2 \
         python-keystonemiddleware \
         python-netaddr \
+        python-netifaces \
+        python-neutron-lib \
         python-neutronclient \
-        python-retrying \
+        python-tenacity \
         python-ryu \
         python-sqlalchemy \
         python-webob \
-        python-keystoneclient \
+        python-keystoneauth1 \
         python-alembic \
         python-six \
         python-stevedore \
+        python-oslo.cache \
         python-oslo.concurrency \
         python-oslo.config \
         python-oslo.context \
@@ -268,38 +366,57 @@ RDEPENDS_${PN} += " \
         python-oslo.messaging \
         python-oslo.middleware \
         python-oslo.policy \
+        python-oslo.privsep \
+        python-oslo.reports \
         python-oslo.rootwrap \
         python-oslo.serialization \
         python-oslo.service \
         python-oslo.utils \
         python-oslo.versionedobjects \
+        python-osprofiler \
+        python-ovs \
+        python-ovsdbapp \
+        python-psutil \
+        python-pyroute2 \
+        python-weakrefmethod \
         python-novaclient \
-        python-routes \
-        "
+        python-designateclient \
+        python-os-xenapi \
+        "
 
 RDEPENDS_${SRCNAME} = "${PN} \
         postgresql postgresql-client python-psycopg2"
 
-RDEPENDS_${SRCNAME}-server = "${SRCNAME}"
+RDEPENDS_${SRCNAME}-server = "${SRCNAME} ${SRCNAME}-plugin-ml2 ${SRCNAME}-dhcp-agent ${SRCNAME}-linuxbridge-agent ${SRCNAME}-metadata-agent"
 RDEPENDS_${SRCNAME}-plugin-openvswitch = "${SRCNAME} ${SRCNAME}-plugin-ml2 ${SRCNAME}-plugin-openvswitch-setup openvswitch-switch iproute2 bridge-utils"
 RDEPENDS_${SRCNAME}-plugin-openvswitch-setup = "openvswitch-switch "
 RDEPENDS_${SRCNAME}-dhcp-agent = "${SRCNAME} dnsmasq dhcp-server dhcp-server-config"
+RDEPENDS_${SRCNAME}-linuxbridge-agent = "${SRCNAME}"
 RDEPENDS_${SRCNAME}-l3-agent = "${SRCNAME} ${SRCNAME}-metadata-agent iputils"
-RDEPENDS_${SRCNAME}-setup = "postgresql sudo"
+RDEPENDS_${SRCNAME}-metadata-agent = "${SRCNAME}"
+RDEPENDS_${SRCNAME}-plugin-ml2 = "${SRCNAME}"
+RDEPENDS_${SRCNAME}-setup = "postgresql sudo bash"
 
 RRECOMMENDS_${SRCNAME}-server = "${SRCNAME}-plugin-openvswitch"
 
-INITSCRIPT_PACKAGES = "${SRCNAME}-server ${SRCNAME}-plugin-openvswitch ${SRCNAME}-dhcp-agent ${SRCNAME}-l3-agent ${SRCNAME}-metadata-agent"
-INITSCRIPT_NAME_${SRCNAME}-server = "neutron-server"
-INITSCRIPT_PARAMS_${SRCNAME}-server = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
-INITSCRIPT_NAME_${SRCNAME}-plugin-openvswitch = "neutron-openvswitch-agent"
-INITSCRIPT_PARAMS_${SRCNAME}-plugin-openvswitch = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
-INITSCRIPT_NAME_${SRCNAME}-dhcp-agent = "neutron-dhcp-agent"
-INITSCRIPT_PARAMS_${SRCNAME}-dhcp-agent = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
-INITSCRIPT_NAME_${SRCNAME}-l3-agent = "neutron-l3-agent"
-INITSCRIPT_PARAMS_${SRCNAME}-l3-agent = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
-INITSCRIPT_NAME_${SRCNAME}-metadata-agent = "neutron-metadata-agent"
-INITSCRIPT_PARAMS_${SRCNAME}-metadata-agent = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
+#INITSCRIPT_PACKAGES = "${SRCNAME}-plugin-openvswitch ${SRCNAME}-l3-agent"
+#INITSCRIPT_NAME_${SRCNAME}-plugin-openvswitch = "neutron-openvswitch-agent"
+#INITSCRIPT_PARAMS_${SRCNAME}-plugin-openvswitch = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
+#INITSCRIPT_NAME_${SRCNAME}-l3-agent = "neutron-l3-agent"
+#INITSCRIPT_PARAMS_${SRCNAME}-l3-agent = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
+
+SYSTEMD_PACKAGES = " \
+    ${SRCNAME}-server \
+    ${SRCNAME}-setup \
+    ${SRCNAME}-dhcp-agent \
+    ${SRCNAME}-linuxbridge-agent \
+    ${SRCNAME}-metadata-agent \
+    "
+SYSTEMD_SERVICE_${SRCNAME}-server = "neutron-server.service"
+SYSTEMD_SERVICE_${SRCNAME}-dhcp-agent = "neutron-dhcp-agent.service"
+SYSTEMD_SERVICE_${SRCNAME}-linuxbridge-agent = "neutron-linuxbridge-agent.service"
+SYSTEMD_SERVICE_${SRCNAME}-metadata-agent = "neutron-metadata-agent.service"
+SYSTEMD_SERVICE_${SRCNAME}-setup = "neutron-init.service"
 
 MONITOR_SERVICE_PACKAGES = "${SRCNAME}"
 MONITOR_SERVICE_${SRCNAME} = "neutron"