python-quantum/python-neutron: update to havana version

Updating the OpenStack networking component to the havana release version.
As part of this switch, we rename the components from quantum to neutron
and switch to a git based build for the client and servers.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

12 files changed, 114 insertions, 116 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-keystone/identity.sh b/meta-openstack/recipes-devtools/python/python-keystone/identity.sh
index df6fd1c..5027976 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone/identity.sh
+++ b/meta-openstack/recipes-devtools/python/python-keystone/identity.sh
@@ -73,12 +73,13 @@ if [ $? -eq 1 ]; then
 else
     GLANCE_USER=$(keystone user-get glance | grep " id " | get_field 2)
 fi
-keystone user-get quantum
+keystone user-get neutron
 if [ $? -eq 1 ]; then                                                                                                                           
-    QUANTUM_USER=$(keystone user-create --name=quantum --pass="$SERVICE_PASSWORD" --tenant-id $SERVICE_TENANT --email=quantum@domain.com | grep " id " | get_field 2)
+    NEUTRON_USER=$(keystone user-create --name=neutron --pass="$SERVICE_PASSWORD" --tenant-id $SERVICE_TENANT --email=neutron@domain.com | grep " id " | get_field 2)
 else
-    QUANTUM_USER=$(keystone user-get quantum | grep " id " | get_field 2)
+    NEUTRON_USER=$(keystone user-get neutron | grep " id " | get_field 2)
 fi
+
 keystone user-get cinder
 if [ $? -eq 1 ]; then                                                                                                                           
     CINDER_USER=$(keystone user-create --name=cinder --pass="$SERVICE_PASSWORD" --tenant-id $SERVICE_TENANT --email=cinder@domain.com | grep " id " | get_field 2)
@@ -110,8 +111,8 @@ keystone user-role-add --tenant-id $SERVICE_TENANT --user-id $NOVA_USER --role-i
 keystone user-role-list --user-id $GLANCE_USER --tenant-id $SERVICE_TENANT &> /dev/null
 keystone user-role-add --tenant-id $SERVICE_TENANT --user-id $GLANCE_USER --role-id $ADMIN_ROLE
 
-keystone user-role-list --user-id $QUANTUM_USER --tenant-id $SERVICE_TENANT &> /dev/null
-keystone user-role-add --tenant-id $SERVICE_TENANT --user-id $QUANTUM_USER --role-id $ADMIN_ROLE
+keystone user-role-list --user-id $NEUTRON_USER --tenant-id $SERVICE_TENANT &> /dev/null
+keystone user-role-add --tenant-id $SERVICE_TENANT --user-id $NEUTRON_USER --role-id $ADMIN_ROLE
 
 keystone user-role-list --user-id $CINDER_USER --tenant-id $SERVICE_TENANT &> /dev/null
 keystone user-role-add --tenant-id $SERVICE_TENANT --user-id $CINDER_USER --role-id $ADMIN_ROLE
@@ -125,7 +126,7 @@ VOLUME_SERVICE=$(keystone service-create --name cinder --type volume --descripti
 IMAGE_SERVICE=$(keystone service-create --name glance --type image --description 'OpenStack Image Service' | grep " id " | get_field 2)
 IDENTITY_SERVICE=$(keystone service-create --name keystone --type identity --description 'OpenStack Identity' | grep " id " | get_field 2)
 EC2_SERVICE=$(keystone service-create --name ec2 --type ec2 --description 'OpenStack EC2 service' | grep " id " | get_field 2)
-NETWORK_SERVICE=$(keystone service-create --name quantum --type network --description 'OpenStack Networking service' | grep " id " | get_field 2)
+NETWORK_SERVICE=$(keystone service-create --name neutron --type network --description 'OpenStack Networking service' | grep " id " | get_field 2)
 
 # Create endpoints
 keystone endpoint-create --region $KEYSTONE_REGION --service-id $COMPUTE_SERVICE --publicurl 'http://'"$KEYSTONE_HOST"':8774/v2/$(tenant_id)s' --adminurl 'http://'"$KEYSTONE_HOST"':8774/v2/$(tenant_id)s' --internalurl 'http://'"$KEYSTONE_HOST"':8774/v2/$(tenant_id)s'
diff --git a/meta-openstack/recipes-devtools/python/python-quantum/fix-amqlib-version.patch b/meta-openstack/recipes-devtools/python/python-neutron/fix-amqlib-version.patch
index 72aff5e..4a085b9 100644
--- a/meta-openstack/recipes-devtools/python/python-quantum/fix-amqlib-version.patch
+++ b/meta-openstack/recipes-devtools/python/python-neutron/fix-amqlib-version.patch
@@ -1,7 +1,7 @@
-Index: quantum-2013.1.1/tools/pip-requires
+Index: neutron-2013.1.1/tools/pip-requires
 ===================================================================
---- quantum-2013.1.1.orig/tools/pip-requires
-+++ quantum-2013.1.1/tools/pip-requires
+--- neutron-2013.1.1.orig/tools/pip-requires
++++ neutron-2013.1.1/tools/pip-requires
 @@ -1,7 +1,7 @@
  Paste
  PasteDeploy>=1.5.0
diff --git a/meta-openstack/recipes-devtools/python/python-quantum/linuxbridge_conf.ini b/meta-openstack/recipes-devtools/python/python-neutron/linuxbridge_conf.ini
index 7779621..d3646d5 100644
--- a/meta-openstack/recipes-devtools/python/python-quantum/linuxbridge_conf.ini
+++ b/meta-openstack/recipes-devtools/python/python-neutron/linuxbridge_conf.ini
@@ -23,10 +23,10 @@
 [DATABASE]
 # This line MUST be changed to actually run the plugin.
 # Example:
-# sql_connection = mysql://root:nova@127.0.0.1:3306/quantum_linux_bridge
+# sql_connection = mysql://root:nova@127.0.0.1:3306/neutron_linux_bridge
 # Replace 127.0.0.1 above with the IP address of the database used by the
-# main quantum server. (Leave it as is if the database runs on this host.)
-sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@localhost/quantum
+# main neutron server. (Leave it as is if the database runs on this host.)
+sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@localhost/neutron
 # Database reconnection retry times - in event connectivity is lost
 # set to -1 implies an infinite retry count
 # sql_max_retries = 10
@@ -59,5 +59,5 @@ reconnect_interval = 2
 polling_interval = 2
 
 [SECURITYGROUP]
-# Firewall driver for realizing quantum security group function
-firewall_driver = quantum.agent.linux.iptables_firewall.IptablesFirewallDriver
+# Firewall driver for realizing neutron security group function
+firewall_driver = neutron.agent.linux.iptables_firewall.IptablesFirewallDriver
diff --git a/meta-openstack/recipes-devtools/python/python-quantum/quantum-agent.init b/meta-openstack/recipes-devtools/python/python-neutron/neutron-agent.init
index 1a33d06..f575746 100644
--- a/meta-openstack/recipes-devtools/python/python-quantum/quantum-agent.init
+++ b/meta-openstack/recipes-devtools/python/python-neutron/neutron-agent.init
@@ -9,9 +9,9 @@
 ### END INIT INFO
 
 SUFFIX=@suffix@
-DESC="quantum-$SUFFIX-agent"
-DAEMON="/usr/bin/quantum-$SUFFIX-agent"
-PIDFILE="/var/run/quantum-$SUFFIX-agent.pid"
+DESC="neutron-$SUFFIX-agent"
+DAEMON="/usr/bin/neutron-$SUFFIX-agent"
+PIDFILE="/var/run/neutron-$SUFFIX-agent.pid"
 
 start() 
 {
diff --git a/meta-openstack/recipes-devtools/python/python-quantum/quantum-server.init b/meta-openstack/recipes-devtools/python/python-neutron/neutron-server.init
index e85bc48..387f602 100644
--- a/meta-openstack/recipes-devtools/python/python-quantum/quantum-server.init
+++ b/meta-openstack/recipes-devtools/python/python-neutron/neutron-server.init
@@ -1,19 +1,19 @@
 #!/bin/sh
 
 ### BEGIN INIT INFO
-# Provides:          quantum-server
+# Provides:          neutron-server
 # Required-Start:    $remote_fs $syslog
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 5
 # Default-Stop:      0 1 6
-# Short-Description: quantum-server
+# Short-Description: neutron-server
 # Description:       Provides the Quantum networking service
 ### END INIT INFO
 
-DESC="quantum-server"
-DAEMON="/usr/bin/quantum-server"
-PIDFILE="/var/run/quantum-server.pid"
-DAEMON_ARGS="--config-file=/etc/quantum/quantum.conf --config-file=@plugin@"
+DESC="neutron-server"
+DAEMON="/usr/bin/neutron-server"
+PIDFILE="/var/run/neutron-server.pid"
+DAEMON_ARGS="--config-file=/etc/neutron/neutron.conf --config-file=@plugin@"
 
 start() 
 {
diff --git a/meta-openstack/recipes-devtools/python/python-quantum/ovs_quantum_plugin.ini b/meta-openstack/recipes-devtools/python/python-neutron/ovs_neutron_plugin.ini
index 0981afe..54f50b0 100644
--- a/meta-openstack/recipes-devtools/python/python-quantum/ovs_quantum_plugin.ini
+++ b/meta-openstack/recipes-devtools/python/python-neutron/ovs_neutron_plugin.ini
@@ -1,13 +1,13 @@
 [DATABASE]
 # This line MUST be changed to actually run the plugin.
 # Example:
-# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
+# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_neutron
 # Replace 127.0.0.1 above with the IP address of the database used by the
-# main quantum server. (Leave it as is if the database runs on this host.)
+# main neutron server. (Leave it as is if the database runs on this host.)
 
 # configs with listening issues, may need to use the localhost version
-# sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@localhost/ovs_quantum
-sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@%CONTROLLER_IP%/ovs_quantum
+# sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@localhost/ovs_neutron
+sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@%CONTROLLER_IP%/ovs_neutron
 # Database reconnection retry times - in event connectivity is lost
 # set to -1 implies an infinite retry count
 # sql_max_retries = 10
@@ -104,8 +104,8 @@ tunnel_id_ranges = 1:1000
 polling_interval = 2
 
 [SECURITYGROUP]
-# Firewall driver for realizing quantum security group function
-# firewall_driver = quantum.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
+# Firewall driver for realizing neutron security group function
+# firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
 
 #-----------------------------------------------------------------------------
 # Sample Configurations.
@@ -113,7 +113,7 @@ polling_interval = 2
 #
 # 1. With VLANs on eth1.
 # [DATABASE]
-# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
+# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_neutron
 # [OVS]
 # network_vlan_ranges = default:2000:3999
 # tunnel_id_ranges =
@@ -124,7 +124,7 @@ polling_interval = 2
 #
 # 2. With tunneling.
 # [DATABASE]
-# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
+# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_neutron
 # [OVS]
 # network_vlan_ranges =
 # tunnel_id_ranges = 1:1000
diff --git a/meta-openstack/recipes-devtools/python/python-quantum_2013.1.3.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
index 8198e6a..588849a 100644
--- a/meta-openstack/recipes-devtools/python/python-quantum_2013.1.3.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
@@ -1,42 +1,40 @@
-DESCRIPTION = "Quantum (virtual network service)"
-HOMEPAGE = "https://launchpad.net/quantum"
+DESCRIPTION = "Neutron (virtual network service)"
+HOMEPAGE = "https://launchpad.net/neutron"
 SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
 PR = "r0"
-SRCNAME = "quantum"
+SRCNAME = "neutron"
 
-SRC_URI = "https://launchpad.net/${SRCNAME}/grizzly/${PV}/+download/${SRCNAME}-${PV}.tar.gz \
-      file://ovs_quantum_plugin.ini \
-      file://linuxbridge_conf.ini \
-      file://quantum-server.init \
-      file://quantum-agent.init \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \
+           file://ovs_neutron_plugin.ini \
+           file://linuxbridge_conf.ini \
+           file://neutron-server.init \
+           file://neutron-agent.init \
           "
+SRCREV="a3f8cf3513c01ed2f92af9d49a92a67a67f80308"
+PV="2013.2+git${SRCPV}"
 
-SRC_URI[md5sum] = "ca410283029db2cade16c8af003f9b7f"
-SRC_URI[sha256sum] = "79e60ec1aef800da3a4e1841909cdd8b2cf645979d08f27bc481957c7944e93d"
-
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
+S = "${WORKDIR}/git"
 
 inherit setuptools update-rc.d identity hosts
 
 do_install_append() {
     TEMPLATE_CONF_DIR=${S}${sysconfdir}/
-    QUANTUM_CONF_DIR=${D}${sysconfdir}/quantum
+    NEUTRON_CONF_DIR=${D}${sysconfdir}/neutron
 
     sed -e "s:%SERVICE_TENANT_NAME%:${SERVICE_TENANT_NAME}:g" \
-        ${TEMPLATE_CONF_DIR}/quantum.conf > ${WORKDIR}/quantum.conf
-    sed -e "s:%SERVICE_USER%:${SRCNAME}:g" -i ${WORKDIR}/quantum.conf
+        ${TEMPLATE_CONF_DIR}/neutron.conf > ${WORKDIR}/neutron.conf
+    sed -e "s:%SERVICE_USER%:${SRCNAME}:g" -i ${WORKDIR}/neutron.conf
     sed -e "s:%SERVICE_PASSWORD%:${SERVICE_PASSWORD}:g" \
-        -i ${WORKDIR}/quantum.conf
-    sed -e "s:^# core_plugin.*:core_plugin = quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2:g" \
-        -i ${WORKDIR}/quantum.conf
+        -i ${WORKDIR}/neutron.conf
+    sed -e "s:^# core_plugin.*:core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2:g" \
+        -i ${WORKDIR}/neutron.conf
 
-    echo "rabbit_host = ${CONTROLLER_IP}" >> ${WORKDIR}/quantum.conf
+    echo "rabbit_host = ${CONTROLLER_IP}" >> ${WORKDIR}/neutron.conf
 
-    for file in ovs_quantum_plugin.ini linuxbridge_conf.ini
+    for file in ovs_neutron_plugin.ini linuxbridge_conf.ini
     do
         sed -e "s:%DB_USER%:${DB_USER}:g" -i ${WORKDIR}/${file}
         sed -e "s:%DB_PASSWORD%:${DB_PASSWORD}:g" -i ${WORKDIR}/${file}
@@ -44,26 +42,26 @@ do_install_append() {
         sed -e "s:%CONTROLLER_HOST%:${CONTROLLER_HOST}:g" -i ${WORKDIR}/${file}
     done
 
-    install -d ${QUANTUM_CONF_DIR}
-    install -d ${QUANTUM_CONF_DIR}/plugins/openvswitch
-    install -d ${QUANTUM_CONF_DIR}/plugins/linuxbridge
+    install -d ${NEUTRON_CONF_DIR}
+    install -d ${NEUTRON_CONF_DIR}/plugins/openvswitch
+    install -d ${NEUTRON_CONF_DIR}/plugins/linuxbridge
 
-    install -m 600 ${WORKDIR}/quantum.conf ${QUANTUM_CONF_DIR}/
-    install -m 600 ${WORKDIR}/ovs_quantum_plugin.ini ${QUANTUM_CONF_DIR}/plugins/openvswitch/
-    install -m 600 ${WORKDIR}/linuxbridge_conf.ini ${QUANTUM_CONF_DIR}/plugins/linuxbridge/
-    install -m 600 ${S}/etc/api-paste.ini ${QUANTUM_CONF_DIR}/
-    install -m 600 ${S}/etc/policy.json ${QUANTUM_CONF_DIR}/
+    install -m 600 ${WORKDIR}/neutron.conf ${NEUTRON_CONF_DIR}/
+    install -m 600 ${WORKDIR}/ovs_neutron_plugin.ini ${NEUTRON_CONF_DIR}/plugins/openvswitch/
+    install -m 600 ${WORKDIR}/linuxbridge_conf.ini ${NEUTRON_CONF_DIR}/plugins/linuxbridge/
+    install -m 600 ${S}/etc/api-paste.ini ${NEUTRON_CONF_DIR}/
+    install -m 600 ${S}/etc/policy.json ${NEUTRON_CONF_DIR}/
 
     install -d ${D}${localstatedir}/log/${SRCNAME}
 
     PLUGIN=openvswitch
     if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
         install -d ${D}${sysconfdir}/init.d
-        sed "s:@plugin@:/etc/quantum/plugins/$PLUGIN/ovs_quantum_plugin.ini:" \
-             < ${WORKDIR}/quantum-server.init >${WORKDIR}/quantum-server.init.sh
-        install -m 0755 ${WORKDIR}/quantum-server.init.sh ${D}${sysconfdir}/init.d/quantum-server
-        sed "s:@suffix@:$PLUGIN:" < ${WORKDIR}/quantum-agent.init >${WORKDIR}/quantum-$PLUGIN.init.sh
-        install -m 0755 ${WORKDIR}/quantum-$PLUGIN.init.sh ${D}${sysconfdir}/init.d/quantum-$PLUGIN-agent
+        sed "s:@plugin@:/etc/neutron/plugins/$PLUGIN/ovs_neutron_plugin.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:" < ${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
 }
 
@@ -79,7 +77,7 @@ pkg_postinst_${SRCNAME} () {
        sleep 5
     fi
 
-    sudo -u postgres createdb ovs_quantum
+    sudo -u postgres createdb ovs_neutron
 }
 
 pkg_postinst_${SRCNAME}-plugin-openvswitch () {
@@ -106,43 +104,43 @@ PACKAGES += " \
 FILES_${PN} = "${libdir}/*"
 
 FILES_${SRCNAME} = " \
-    ${bindir}/quantum-db-manage \
-    ${bindir}/quantum-rootwrap \
-    ${bindir}/quantum-debug \
-    ${bindir}/quantum-netns-cleanup \
-    ${bindir}/quantum-ovs-cleanup \
+    ${bindir}/neutron-db-manage \
+    ${bindir}/neutron-rootwrap \
+    ${bindir}/neutron-debug \
+    ${bindir}/neutron-netns-cleanup \
+    ${bindir}/neutron-ovs-cleanup \
     ${sysconfdir}/${SRCNAME}/* \
     ${localstatedir}/* \    
     "
 
-FILES_${SRCNAME}-server = "${bindir}/quantum-server \
-    ${sysconfdir}/init.d/quantum-server \
+FILES_${SRCNAME}-server = "${bindir}/neutron-server \
+    ${sysconfdir}/init.d/neutron-server \
     "
 
 FILES_${SRCNAME}-plugin-openvswitch = " \
-    ${bindir}/quantum-openvswitch-agent \
-    ${sysconfdir}/${SRCNAME}/plugins/openvswitch/ovs_quantum_plugin.ini \
-    ${sysconfdir}/init.d/quantum-openvswitch-agent \
+    ${bindir}/neutron-openvswitch-agent \
+    ${sysconfdir}/${SRCNAME}/plugins/openvswitch/ovs_neutron_plugin.ini \
+    ${sysconfdir}/init.d/neutron-openvswitch-agent \
     "
 
 FILES_${SRCNAME}-plugin-linuxbridge = " \
-    ${bindir}/quantum-linuxbridge-agent \
+    ${bindir}/neutron-linuxbridge-agent \
     ${sysconfdir}/${SRCNAME}/plugins/linuxbridge/linuxbridge_conf.ini \
-    ${sysconfdir}/init.d/quantum-linuxbridge-agent \
+    ${sysconfdir}/init.d/neutron-linuxbridge-agent \
     "
 
-FILES_${SRCNAME}-dhcp-agent = "${bindir}/quantum-dhcp-agent \
-    ${bindir}/quantum-dhcp-agent-dnsmasq-lease-update \
+FILES_${SRCNAME}-dhcp-agent = "${bindir}/neutron-dhcp-agent \
+    ${bindir}/neutron-dhcp-agent-dnsmasq-lease-update \
     ${sysconfdir}/${SRCNAME}/dhcp_agent.ini \
     ${sysconfdir}/init.d/dhcp_agent \
     "
 
-FILES_${SRCNAME}-l3-agent = "${bindir}/quantum-l3-agent \
+FILES_${SRCNAME}-l3-agent = "${bindir}/neutron-l3-agent \
     ${sysconfdir}/${SRCNAME}/l3_agent.ini \
     ${sysconfdir}/init.d/l3_agent \
     "
 
-FILES_${SRCNAME}-metadata-agent = "${bindir}/quantum-metadata-agent \
+FILES_${SRCNAME}-metadata-agent = "${bindir}/neutron-metadata-agent \
     ${sysconfdir}/${SRCNAME}/metadata_agent.ini \
     ${sysconfdir}/init.d/metadata_agent \
     "
@@ -163,7 +161,7 @@ RDEPENDS_${PN} += "python-paste \
         python-iso8601 \
         python-kombu \
         python-netaddr \
-        python-quantumclient \
+        python-neutronclient \
         python-sqlalchemy \
         python-webob \
         python-keystoneclient \
@@ -187,6 +185,6 @@ RDEPENDS_${SRCNAME}-l3-agent = "${SRCNAME} ${SRCNAME}-metadata-agent iputils"
 RRECOMMENDS_${SRCNAME}-server = "${SRCNAME}-plugin-openvswitch"
 
 INITSCRIPT_PACKAGES = "${SRCNAME}-server ${SRCNAME}-plugin-openvswitch ${SRCNAME}-plugin-linuxbridge"
-INITSCRIPT_NAME_${SRCNAME}-server = "quantum-server"
-INITSCRIPT_NAME_${SRCNAME}-plugin-openvswitch = "quantum-openvswitch-agent"
-INITSCRIPT_NAME_${SRCNAME}-plugin-linuxbridge = "quantum-linuxbridge-agent"
+INITSCRIPT_NAME_${SRCNAME}-server = "neutron-server"
+INITSCRIPT_NAME_${SRCNAME}-plugin-openvswitch = "neutron-openvswitch-agent"
+INITSCRIPT_NAME_${SRCNAME}-plugin-linuxbridge = "neutron-linuxbridge-agent"
diff --git a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
new file mode 100644
index 0000000..7bcd057
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "CLI and python client library for OpenStack Neutron"
+HOMEPAGE = "https://launchpad.net/neutron"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
+
+RDEPENDS_${PN} +="python-cliff \
+        python-httplib2 \
+        python-iso8601 \
+        python-prettytable \
+        python-pyparsing \
+        python-simplejson \
+        "
+
+PR = "r0"
+
+SRC_URI = "git://github.com/openstack/python-neutronclient.git;branch=master"
+
+PV="git${SRCPV}"
+SRCREV="1598fc0f75503f8c357ac4b58f77edf6e0443a69"
+S = "${WORKDIR}/git"
+
+inherit setuptools
diff --git a/meta-openstack/recipes-devtools/python/python-quantumclient_2.2.1.bb b/meta-openstack/recipes-devtools/python/python-quantumclient_2.2.1.bb
deleted file mode 100644
index ccbc665..0000000
--- a/meta-openstack/recipes-devtools/python/python-quantumclient_2.2.1.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "CLI and python client library for OpenStack Quantum"
-HOMEPAGE = "https://launchpad.net/quantum"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-
-RDEPENDS_${PN} +="python-cliff \
-        python-httplib2 \
-        python-iso8601 \
-        python-prettytable \
-        python-pyparsing \
-        python-simplejson \
-        "
-
-PR = "r0"
-
-SRC_URI = "https://pypi.python.org/packages/source/p/${PN}/${PN}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "d319be32c95aa6e0110db925d5c3cfc9"
-SRC_URI[sha256sum] = "9c445a8a2fc751561e84e8633542bc8e77666cf8e4f01acce7cc8137acd43bee"
-
-S = "${WORKDIR}/${PN}-${PV}"
-
-inherit setuptools
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb
index 9f6cd22..d519827 100644
--- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb
+++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb
@@ -12,7 +12,7 @@ RDEPENDS_${PN} = " qemu \
     libvirt-virsh \
     nova-compute \
     python-novaclient \
-    quantum-plugin-openvswitch \
+    neutron-plugin-openvswitch \
     openvswitch-switch \
     "
 
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb
index a5a61e2..a9813b6 100644
--- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb
+++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb
@@ -16,8 +16,8 @@ RDEPENDS_${PN} = " postgresql \
     glance-api \
     glance-registry \
     keystone \
-    quantum-server \
-    quantum-plugin-openvswitch \
+    neutron-server \
+    neutron-plugin-openvswitch \
     openvswitch-controller \
     cinder-api \
     cinder-volume \
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-network.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-network.bb
index 430453b..f6dadc1 100644
--- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-network.bb
+++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-network.bb
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 inherit packagegroup
 
 RDEPENDS_${PN} = " \
-    quantum-plugin-openvswitch \
-    quantum-dhcp-agent \
-    quantum-l3-agent \
+    neutron-plugin-openvswitch \
+    neutron-dhcp-agent \
+    neutron-l3-agent \
     openvswitch-switch \
     "