From a5a59d040b5db77a06346a516d30566a21d41586 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 31 Oct 2013 00:22:52 -0400 Subject: 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 --- .../python/python-keystone/identity.sh | 13 +- .../python/python-neutron/fix-amqlib-version.patch | 13 ++ .../python/python-neutron/linuxbridge_conf.ini | 63 +++++++ .../python/python-neutron/neutron-agent.init | 70 ++++++++ .../python/python-neutron/neutron-server.init | 73 ++++++++ .../python/python-neutron/ovs_neutron_plugin.ini | 133 ++++++++++++++ .../recipes-devtools/python/python-neutron_git.bb | 190 ++++++++++++++++++++ .../python/python-neutronclient_git.bb | 23 +++ .../python/python-quantum/fix-amqlib-version.patch | 13 -- .../python/python-quantum/linuxbridge_conf.ini | 63 ------- .../python/python-quantum/ovs_quantum_plugin.ini | 133 -------------- .../python/python-quantum/quantum-agent.init | 70 -------- .../python/python-quantum/quantum-server.init | 73 -------- .../python/python-quantum_2013.1.3.bb | 192 --------------------- .../python/python-quantumclient_2.2.1.bb | 24 --- 15 files changed, 572 insertions(+), 574 deletions(-) create mode 100644 meta-openstack/recipes-devtools/python/python-neutron/fix-amqlib-version.patch create mode 100644 meta-openstack/recipes-devtools/python/python-neutron/linuxbridge_conf.ini create mode 100644 meta-openstack/recipes-devtools/python/python-neutron/neutron-agent.init create mode 100644 meta-openstack/recipes-devtools/python/python-neutron/neutron-server.init create mode 100644 meta-openstack/recipes-devtools/python/python-neutron/ovs_neutron_plugin.ini create mode 100644 meta-openstack/recipes-devtools/python/python-neutron_git.bb create mode 100644 meta-openstack/recipes-devtools/python/python-neutronclient_git.bb delete mode 100644 meta-openstack/recipes-devtools/python/python-quantum/fix-amqlib-version.patch delete mode 100644 meta-openstack/recipes-devtools/python/python-quantum/linuxbridge_conf.ini delete mode 100644 meta-openstack/recipes-devtools/python/python-quantum/ovs_quantum_plugin.ini delete mode 100644 meta-openstack/recipes-devtools/python/python-quantum/quantum-agent.init delete mode 100644 meta-openstack/recipes-devtools/python/python-quantum/quantum-server.init delete mode 100644 meta-openstack/recipes-devtools/python/python-quantum_2013.1.3.bb delete mode 100644 meta-openstack/recipes-devtools/python/python-quantumclient_2.2.1.bb (limited to 'meta-openstack/recipes-devtools/python') 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-neutron/fix-amqlib-version.patch b/meta-openstack/recipes-devtools/python/python-neutron/fix-amqlib-version.patch new file mode 100644 index 0000000..4a085b9 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-neutron/fix-amqlib-version.patch @@ -0,0 +1,13 @@ +Index: neutron-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 + Routes>=1.12.3 +-amqplib==0.6.1 ++amqplib>=0.6.1 + anyjson>=0.2.4 + argparse + eventlet>=0.9.17 diff --git a/meta-openstack/recipes-devtools/python/python-neutron/linuxbridge_conf.ini b/meta-openstack/recipes-devtools/python/python-neutron/linuxbridge_conf.ini new file mode 100644 index 0000000..d3646d5 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-neutron/linuxbridge_conf.ini @@ -0,0 +1,63 @@ +[VLANS] +# (StrOpt) Type of network to allocate for tenant networks. The +# default value 'local' is useful only for single-box testing and +# provides no connectivity between hosts. You MUST change this to +# 'vlan' and configure network_vlan_ranges below in order for tenant +# networks to provide connectivity between hosts. Set to 'none' to +# disable creation of tenant networks. +# +# Default: tenant_network_type = local +# Example: tenant_network_type = vlan + +# (ListOpt) Comma-separated list of +# [::] tuples enumerating ranges +# of VLAN IDs on named physical networks that are available for +# allocation. All physical networks listed are available for flat and +# VLAN provider network creation. Specified ranges of VLAN IDs are +# available for tenant network allocation if tenant_network_type is +# 'vlan'. If empty, only local networks may be created. +# +# Default: network_vlan_ranges = +# Example: network_vlan_ranges = physnet1:1000:2999 + +[DATABASE] +# This line MUST be changed to actually run the plugin. +# Example: +# 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 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 +# Database reconnection interval in seconds - if the initial connection to the +# database fails +reconnect_interval = 2 +# Enable the use of eventlet's db_pool for MySQL. The flags sql_min_pool_size, +# sql_max_pool_size and sql_idle_timeout are relevant only if this is enabled. +# sql_dbpool_enable = False +# Minimum number of SQL connections to keep open in a pool +# sql_min_pool_size = 1 +# Maximum number of SQL connections to keep open in a pool +# sql_max_pool_size = 5 +# Timeout in seconds before idle sql connections are reaped +# sql_idle_timeout = 3600 + +[LINUX_BRIDGE] +# (ListOpt) Comma-separated list of +# : tuples mapping physical +# network names to the agent's node-specific physical network +# interfaces to be used for flat and VLAN networks. All physical +# networks listed in network_vlan_ranges on the server should have +# mappings to appropriate interfaces on each agent. +# +# Default: physical_interface_mappings = +# Example: physical_interface_mappings = physnet1:eth1 + +[AGENT] +# Agent's polling interval in seconds +polling_interval = 2 + +[SECURITYGROUP] +# 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-neutron/neutron-agent.init b/meta-openstack/recipes-devtools/python/python-neutron/neutron-agent.init new file mode 100644 index 0000000..f575746 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-neutron/neutron-agent.init @@ -0,0 +1,70 @@ +#! /bin/sh + +### BEGIN INIT INFO +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 5 +# Default-Stop: 0 1 6 +# Description: Quantum networking agent +### END INIT INFO + +SUFFIX=@suffix@ +DESC="neutron-$SUFFIX-agent" +DAEMON="/usr/bin/neutron-$SUFFIX-agent" +PIDFILE="/var/run/neutron-$SUFFIX-agent.pid" + +start() +{ + if [ -e $PIDFILE ]; then + PIDDIR=/proc/$(cat $PIDFILE) + if [ -d ${PIDDIR} ]; then + echo "$DESC already running." + exit 1 + else + echo "Removing stale PID file $PIDFILE" + rm -f $PIDFILE + fi + fi + + echo -n "Starting $DESC..." + + start-stop-daemon --start --quiet --background \ + --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} + + if [ $? -eq 0 ]; then + echo "done." + else + echo "failed." + fi +} + +stop() +{ + echo -n "Stopping $DESC..." + start-stop-daemon --stop --quiet --pidfile $PIDFILE + if [ $? -eq 0 ]; then + echo "done." + else + echo "failed." + fi + rm -f $PIDFILE +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|force-reload) + stop + start + ;; + *) + echo "Usage: $0 {start|stop|force-reload|restart}" + exit 1 + ;; +esac + +exit 0 diff --git a/meta-openstack/recipes-devtools/python/python-neutron/neutron-server.init b/meta-openstack/recipes-devtools/python/python-neutron/neutron-server.init new file mode 100644 index 0000000..387f602 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-neutron/neutron-server.init @@ -0,0 +1,73 @@ +#!/bin/sh + +### BEGIN INIT INFO +# 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: neutron-server +# Description: Provides the Quantum networking service +### END INIT INFO + +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() +{ + if [ -e $PIDFILE ]; then + PIDDIR=/proc/$(cat $PIDFILE) + if [ -d ${PIDDIR} ]; then + echo "$DESC already running." + exit 1 + else + echo "Removing stale PID file $PIDFILE" + rm -f $PIDFILE + fi + fi + + echo -n "Starting $DESC..." + + start-stop-daemon --start --quiet --background \ + --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} \ + -- $DAEMON_ARGS + + if [ $? -eq 0 ]; then + echo "done." + else + echo "failed." + fi +} + +stop() +{ + echo -n "Stopping $DESC..." + start-stop-daemon --stop --quiet --pidfile $PIDFILE + if [ $? -eq 0 ]; then + echo "done." + else + echo "failed." + fi + rm -f $PIDFILE +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|force-reload) + stop + start + ;; + *) + echo "Usage: $0 {start|stop|force-reload|restart}" + exit 1 + ;; +esac + +exit 0 diff --git a/meta-openstack/recipes-devtools/python/python-neutron/ovs_neutron_plugin.ini b/meta-openstack/recipes-devtools/python/python-neutron/ovs_neutron_plugin.ini new file mode 100644 index 0000000..54f50b0 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-neutron/ovs_neutron_plugin.ini @@ -0,0 +1,133 @@ +[DATABASE] +# This line MUST be changed to actually run the plugin. +# Example: +# 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 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_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 +# Database reconnection interval in seconds - if the initial connection to the +# database fails +reconnect_interval = 2 +# Enable the use of eventlet's db_pool for MySQL. The flags sql_min_pool_size, +# sql_max_pool_size and sql_idle_timeout are relevant only if this is enabled. +# sql_dbpool_enable = False +# Minimum number of SQL connections to keep open in a pool +# sql_min_pool_size = 1 +# Maximum number of SQL connections to keep open in a pool +# sql_max_pool_size = 5 +# Timeout in seconds before idle sql connections are reaped +# sql_idle_timeout = 3600 + +[OVS] +# (StrOpt) Type of network to allocate for tenant networks. The +# default value 'local' is useful only for single-box testing and +# provides no connectivity between hosts. You MUST either change this +# to 'vlan' and configure network_vlan_ranges below or change this to +# 'gre' and configure tunnel_id_ranges below in order for tenant +# networks to provide connectivity between hosts. Set to 'none' to +# disable creation of tenant networks. +# +# Default: tenant_network_type = local +# Example: tenant_network_type = gre +tenant_network_type = gre + +# (ListOpt) Comma-separated list of +# [::] tuples enumerating ranges +# of VLAN IDs on named physical networks that are available for +# allocation. All physical networks listed are available for flat and +# VLAN provider network creation. Specified ranges of VLAN IDs are +# available for tenant network allocation if tenant_network_type is +# 'vlan'. If empty, only gre and local networks may be created. +# +# Default: network_vlan_ranges = +# Example: network_vlan_ranges = physnet1:1000:2999 + +# (BoolOpt) Set to True in the server and the agents to enable support +# for GRE networks. Requires kernel support for OVS patch ports and +# GRE tunneling. +# +# Default: enable_tunneling = False +enable_tunneling = True + +# (ListOpt) Comma-separated list of : tuples +# enumerating ranges of GRE tunnel IDs that are available for tenant +# network allocation if tenant_network_type is 'gre'. +# +# Default: tunnel_id_ranges = +# Example: tunnel_id_ranges = 1:1000 +tunnel_id_ranges = 1:1000 + +# Do not change this parameter unless you have a good reason to. +# This is the name of the OVS integration bridge. There is one per hypervisor. +# The integration bridge acts as a virtual "patch bay". All VM VIFs are +# attached to this bridge and then "patched" according to their network +# connectivity. +# +# Default: integration_bridge = br-int + +# Only used for the agent if tunnel_id_ranges (above) is not empty for +# the server. In most cases, the default value should be fine. +# +# Default: tunnel_bridge = br-tun + +# Peer patch port in integration bridge for tunnel bridge +# int_peer_patch_port = patch-tun + +# Peer patch port in tunnel bridge for integration bridge +# tun_peer_patch_port = patch-int + +# Uncomment this line for the agent if tunnel_id_ranges (above) is not +# empty for the server. Set local-ip to be the local IP address of +# this hypervisor. +# +# Default: local_ip = + +# (ListOpt) Comma-separated list of : tuples +# mapping physical network names to the agent's node-specific OVS +# bridge names to be used for flat and VLAN networks. The length of +# bridge names should be no more than 11. Each bridge must +# exist, and should have a physical network interface configured as a +# port. All physical networks listed in network_vlan_ranges on the +# server should have mappings to appropriate bridges on each agent. +# +# Default: bridge_mappings = +# Example: bridge_mappings = physnet1:br-eth1 + +[AGENT] +# Agent's polling interval in seconds +polling_interval = 2 + +[SECURITYGROUP] +# Firewall driver for realizing neutron security group function +# firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver + +#----------------------------------------------------------------------------- +# Sample Configurations. +#----------------------------------------------------------------------------- +# +# 1. With VLANs on eth1. +# [DATABASE] +# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_neutron +# [OVS] +# network_vlan_ranges = default:2000:3999 +# tunnel_id_ranges = +# integration_bridge = br-int +# bridge_mappings = default:br-eth1 +# [AGENT] +# Add the following setting, if you want to log to a file +# +# 2. With tunneling. +# [DATABASE] +# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_neutron +# [OVS] +# network_vlan_ranges = +# tunnel_id_ranges = 1:1000 +# integration_bridge = br-int +# tunnel_bridge = br-tun +# local_ip = 10.0.0.3 diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb new file mode 100644 index 0000000..588849a --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb @@ -0,0 +1,190 @@ +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 = "neutron" + +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}" + +S = "${WORKDIR}/git" + +inherit setuptools update-rc.d identity hosts + +do_install_append() { + TEMPLATE_CONF_DIR=${S}${sysconfdir}/ + NEUTRON_CONF_DIR=${D}${sysconfdir}/neutron + + sed -e "s:%SERVICE_TENANT_NAME%:${SERVICE_TENANT_NAME}:g" \ + ${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}/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}/neutron.conf + + 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} + sed -e "s:%CONTROLLER_IP%:${CONTROLLER_IP}:g" -i ${WORKDIR}/${file} + sed -e "s:%CONTROLLER_HOST%:${CONTROLLER_HOST}:g" -i ${WORKDIR}/${file} + done + + install -d ${NEUTRON_CONF_DIR} + install -d ${NEUTRON_CONF_DIR}/plugins/openvswitch + install -d ${NEUTRON_CONF_DIR}/plugins/linuxbridge + + 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/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 +} + +pkg_postinst_${SRCNAME} () { + if [ "x$D" != "x" ]; then + exit 1 + fi + + # This is to make sure postgres is configured and running + if ! pidof postmaster > /dev/null; then + /etc/init.d/postgresql-init + /etc/init.d/postgresql start + sleep 5 + fi + + sudo -u postgres createdb ovs_neutron +} + +pkg_postinst_${SRCNAME}-plugin-openvswitch () { + if [ "x$D" != "x" ]; then + exit 1 + fi + + /etc/init.d/openvswitch-switch start + ovs-vsctl --no-wait -- --may-exist add-br br-int +} + +PACKAGES += " \ + ${SRCNAME} \ + ${SRCNAME}-doc \ + ${SRCNAME}-server \ + ${SRCNAME}-plugin-openvswitch \ + ${SRCNAME}-plugin-linuxbridge \ + ${SRCNAME}-dhcp-agent \ + ${SRCNAME}-l3-agent \ + ${SRCNAME}-metadata-agent \ + ${SRCNAME}-extra-agents \ + " + +FILES_${PN} = "${libdir}/*" + +FILES_${SRCNAME} = " \ + ${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}/neutron-server \ + ${sysconfdir}/init.d/neutron-server \ + " + +FILES_${SRCNAME}-plugin-openvswitch = " \ + ${bindir}/neutron-openvswitch-agent \ + ${sysconfdir}/${SRCNAME}/plugins/openvswitch/ovs_neutron_plugin.ini \ + ${sysconfdir}/init.d/neutron-openvswitch-agent \ + " + +FILES_${SRCNAME}-plugin-linuxbridge = " \ + ${bindir}/neutron-linuxbridge-agent \ + ${sysconfdir}/${SRCNAME}/plugins/linuxbridge/linuxbridge_conf.ini \ + ${sysconfdir}/init.d/neutron-linuxbridge-agent \ + " + +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}/neutron-l3-agent \ + ${sysconfdir}/${SRCNAME}/l3_agent.ini \ + ${sysconfdir}/init.d/l3_agent \ + " + +FILES_${SRCNAME}-metadata-agent = "${bindir}/neutron-metadata-agent \ + ${sysconfdir}/${SRCNAME}/metadata_agent.ini \ + ${sysconfdir}/init.d/metadata_agent \ + " + +FILES_${SRCNAME}-extra-agents = "${bindir}/*" + +FILES_${SRCNAME}-doc = "${datadir}/*" + +RDEPENDS_${PN} += "python-paste \ + python-pastedeploy \ + python-routes \ + python-amqplib \ + python-anyjson \ + python-alembic \ + python-eventlet \ + python-greenlet \ + python-httplib2 \ + python-iso8601 \ + python-kombu \ + python-netaddr \ + python-neutronclient \ + python-sqlalchemy \ + python-webob \ + python-keystoneclient \ + python-oslo.config \ + python-pyudev \ + python-novaclient \ + python-mako \ + python-markupsafe \ + python-pyparsing \ + " + +RDEPENDS_${SRCNAME} = "${PN} \ + postgresql postgresql-client python-psycopg2" + +RDEPENDS_${SRCNAME}-server = "${SRCNAME}" +RDEPENDS_${SRCNAME}-plugin-openvswitch = "${SRCNAME} openvswitch-switch " +RDEPENDS_${SRCNAME}-plugin-linuxbridge = "${SRCNAME} bridge-utils" +RDEPENDS_${SRCNAME}-dhcp-agent = "${SRCNAME} dnsmasq" +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 = "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-quantum/fix-amqlib-version.patch b/meta-openstack/recipes-devtools/python/python-quantum/fix-amqlib-version.patch deleted file mode 100644 index 72aff5e..0000000 --- a/meta-openstack/recipes-devtools/python/python-quantum/fix-amqlib-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: quantum-2013.1.1/tools/pip-requires -=================================================================== ---- quantum-2013.1.1.orig/tools/pip-requires -+++ quantum-2013.1.1/tools/pip-requires -@@ -1,7 +1,7 @@ - Paste - PasteDeploy>=1.5.0 - Routes>=1.12.3 --amqplib==0.6.1 -+amqplib>=0.6.1 - anyjson>=0.2.4 - argparse - eventlet>=0.9.17 diff --git a/meta-openstack/recipes-devtools/python/python-quantum/linuxbridge_conf.ini b/meta-openstack/recipes-devtools/python/python-quantum/linuxbridge_conf.ini deleted file mode 100644 index 7779621..0000000 --- a/meta-openstack/recipes-devtools/python/python-quantum/linuxbridge_conf.ini +++ /dev/null @@ -1,63 +0,0 @@ -[VLANS] -# (StrOpt) Type of network to allocate for tenant networks. The -# default value 'local' is useful only for single-box testing and -# provides no connectivity between hosts. You MUST change this to -# 'vlan' and configure network_vlan_ranges below in order for tenant -# networks to provide connectivity between hosts. Set to 'none' to -# disable creation of tenant networks. -# -# Default: tenant_network_type = local -# Example: tenant_network_type = vlan - -# (ListOpt) Comma-separated list of -# [::] tuples enumerating ranges -# of VLAN IDs on named physical networks that are available for -# allocation. All physical networks listed are available for flat and -# VLAN provider network creation. Specified ranges of VLAN IDs are -# available for tenant network allocation if tenant_network_type is -# 'vlan'. If empty, only local networks may be created. -# -# Default: network_vlan_ranges = -# Example: network_vlan_ranges = physnet1:1000:2999 - -[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 -# 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 -# Database reconnection retry times - in event connectivity is lost -# set to -1 implies an infinite retry count -# sql_max_retries = 10 -# Database reconnection interval in seconds - if the initial connection to the -# database fails -reconnect_interval = 2 -# Enable the use of eventlet's db_pool for MySQL. The flags sql_min_pool_size, -# sql_max_pool_size and sql_idle_timeout are relevant only if this is enabled. -# sql_dbpool_enable = False -# Minimum number of SQL connections to keep open in a pool -# sql_min_pool_size = 1 -# Maximum number of SQL connections to keep open in a pool -# sql_max_pool_size = 5 -# Timeout in seconds before idle sql connections are reaped -# sql_idle_timeout = 3600 - -[LINUX_BRIDGE] -# (ListOpt) Comma-separated list of -# : tuples mapping physical -# network names to the agent's node-specific physical network -# interfaces to be used for flat and VLAN networks. All physical -# networks listed in network_vlan_ranges on the server should have -# mappings to appropriate interfaces on each agent. -# -# Default: physical_interface_mappings = -# Example: physical_interface_mappings = physnet1:eth1 - -[AGENT] -# Agent's polling interval in seconds -polling_interval = 2 - -[SECURITYGROUP] -# Firewall driver for realizing quantum security group function -firewall_driver = quantum.agent.linux.iptables_firewall.IptablesFirewallDriver diff --git a/meta-openstack/recipes-devtools/python/python-quantum/ovs_quantum_plugin.ini b/meta-openstack/recipes-devtools/python/python-quantum/ovs_quantum_plugin.ini deleted file mode 100644 index 0981afe..0000000 --- a/meta-openstack/recipes-devtools/python/python-quantum/ovs_quantum_plugin.ini +++ /dev/null @@ -1,133 +0,0 @@ -[DATABASE] -# This line MUST be changed to actually run the plugin. -# Example: -# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum -# 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.) - -# 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 -# Database reconnection retry times - in event connectivity is lost -# set to -1 implies an infinite retry count -# sql_max_retries = 10 -# Database reconnection interval in seconds - if the initial connection to the -# database fails -reconnect_interval = 2 -# Enable the use of eventlet's db_pool for MySQL. The flags sql_min_pool_size, -# sql_max_pool_size and sql_idle_timeout are relevant only if this is enabled. -# sql_dbpool_enable = False -# Minimum number of SQL connections to keep open in a pool -# sql_min_pool_size = 1 -# Maximum number of SQL connections to keep open in a pool -# sql_max_pool_size = 5 -# Timeout in seconds before idle sql connections are reaped -# sql_idle_timeout = 3600 - -[OVS] -# (StrOpt) Type of network to allocate for tenant networks. The -# default value 'local' is useful only for single-box testing and -# provides no connectivity between hosts. You MUST either change this -# to 'vlan' and configure network_vlan_ranges below or change this to -# 'gre' and configure tunnel_id_ranges below in order for tenant -# networks to provide connectivity between hosts. Set to 'none' to -# disable creation of tenant networks. -# -# Default: tenant_network_type = local -# Example: tenant_network_type = gre -tenant_network_type = gre - -# (ListOpt) Comma-separated list of -# [::] tuples enumerating ranges -# of VLAN IDs on named physical networks that are available for -# allocation. All physical networks listed are available for flat and -# VLAN provider network creation. Specified ranges of VLAN IDs are -# available for tenant network allocation if tenant_network_type is -# 'vlan'. If empty, only gre and local networks may be created. -# -# Default: network_vlan_ranges = -# Example: network_vlan_ranges = physnet1:1000:2999 - -# (BoolOpt) Set to True in the server and the agents to enable support -# for GRE networks. Requires kernel support for OVS patch ports and -# GRE tunneling. -# -# Default: enable_tunneling = False -enable_tunneling = True - -# (ListOpt) Comma-separated list of : tuples -# enumerating ranges of GRE tunnel IDs that are available for tenant -# network allocation if tenant_network_type is 'gre'. -# -# Default: tunnel_id_ranges = -# Example: tunnel_id_ranges = 1:1000 -tunnel_id_ranges = 1:1000 - -# Do not change this parameter unless you have a good reason to. -# This is the name of the OVS integration bridge. There is one per hypervisor. -# The integration bridge acts as a virtual "patch bay". All VM VIFs are -# attached to this bridge and then "patched" according to their network -# connectivity. -# -# Default: integration_bridge = br-int - -# Only used for the agent if tunnel_id_ranges (above) is not empty for -# the server. In most cases, the default value should be fine. -# -# Default: tunnel_bridge = br-tun - -# Peer patch port in integration bridge for tunnel bridge -# int_peer_patch_port = patch-tun - -# Peer patch port in tunnel bridge for integration bridge -# tun_peer_patch_port = patch-int - -# Uncomment this line for the agent if tunnel_id_ranges (above) is not -# empty for the server. Set local-ip to be the local IP address of -# this hypervisor. -# -# Default: local_ip = - -# (ListOpt) Comma-separated list of : tuples -# mapping physical network names to the agent's node-specific OVS -# bridge names to be used for flat and VLAN networks. The length of -# bridge names should be no more than 11. Each bridge must -# exist, and should have a physical network interface configured as a -# port. All physical networks listed in network_vlan_ranges on the -# server should have mappings to appropriate bridges on each agent. -# -# Default: bridge_mappings = -# Example: bridge_mappings = physnet1:br-eth1 - -[AGENT] -# Agent's polling interval in seconds -polling_interval = 2 - -[SECURITYGROUP] -# Firewall driver for realizing quantum security group function -# firewall_driver = quantum.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver - -#----------------------------------------------------------------------------- -# Sample Configurations. -#----------------------------------------------------------------------------- -# -# 1. With VLANs on eth1. -# [DATABASE] -# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum -# [OVS] -# network_vlan_ranges = default:2000:3999 -# tunnel_id_ranges = -# integration_bridge = br-int -# bridge_mappings = default:br-eth1 -# [AGENT] -# Add the following setting, if you want to log to a file -# -# 2. With tunneling. -# [DATABASE] -# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum -# [OVS] -# network_vlan_ranges = -# tunnel_id_ranges = 1:1000 -# integration_bridge = br-int -# tunnel_bridge = br-tun -# local_ip = 10.0.0.3 diff --git a/meta-openstack/recipes-devtools/python/python-quantum/quantum-agent.init b/meta-openstack/recipes-devtools/python/python-quantum/quantum-agent.init deleted file mode 100644 index 1a33d06..0000000 --- a/meta-openstack/recipes-devtools/python/python-quantum/quantum-agent.init +++ /dev/null @@ -1,70 +0,0 @@ -#! /bin/sh - -### BEGIN INIT INFO -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Default-Start: 2 3 5 -# Default-Stop: 0 1 6 -# Description: Quantum networking agent -### END INIT INFO - -SUFFIX=@suffix@ -DESC="quantum-$SUFFIX-agent" -DAEMON="/usr/bin/quantum-$SUFFIX-agent" -PIDFILE="/var/run/quantum-$SUFFIX-agent.pid" - -start() -{ - if [ -e $PIDFILE ]; then - PIDDIR=/proc/$(cat $PIDFILE) - if [ -d ${PIDDIR} ]; then - echo "$DESC already running." - exit 1 - else - echo "Removing stale PID file $PIDFILE" - rm -f $PIDFILE - fi - fi - - echo -n "Starting $DESC..." - - start-stop-daemon --start --quiet --background \ - --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} - - if [ $? -eq 0 ]; then - echo "done." - else - echo "failed." - fi -} - -stop() -{ - echo -n "Stopping $DESC..." - start-stop-daemon --stop --quiet --pidfile $PIDFILE - if [ $? -eq 0 ]; then - echo "done." - else - echo "failed." - fi - rm -f $PIDFILE -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|force-reload) - stop - start - ;; - *) - echo "Usage: $0 {start|stop|force-reload|restart}" - exit 1 - ;; -esac - -exit 0 diff --git a/meta-openstack/recipes-devtools/python/python-quantum/quantum-server.init b/meta-openstack/recipes-devtools/python/python-quantum/quantum-server.init deleted file mode 100644 index e85bc48..0000000 --- a/meta-openstack/recipes-devtools/python/python-quantum/quantum-server.init +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh - -### BEGIN INIT INFO -# Provides: quantum-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 -# 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@" - -start() -{ - if [ -e $PIDFILE ]; then - PIDDIR=/proc/$(cat $PIDFILE) - if [ -d ${PIDDIR} ]; then - echo "$DESC already running." - exit 1 - else - echo "Removing stale PID file $PIDFILE" - rm -f $PIDFILE - fi - fi - - echo -n "Starting $DESC..." - - start-stop-daemon --start --quiet --background \ - --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} \ - -- $DAEMON_ARGS - - if [ $? -eq 0 ]; then - echo "done." - else - echo "failed." - fi -} - -stop() -{ - echo -n "Stopping $DESC..." - start-stop-daemon --stop --quiet --pidfile $PIDFILE - if [ $? -eq 0 ]; then - echo "done." - else - echo "failed." - fi - rm -f $PIDFILE -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|force-reload) - stop - start - ;; - *) - echo "Usage: $0 {start|stop|force-reload|restart}" - exit 1 - ;; -esac - -exit 0 diff --git a/meta-openstack/recipes-devtools/python/python-quantum_2013.1.3.bb b/meta-openstack/recipes-devtools/python/python-quantum_2013.1.3.bb deleted file mode 100644 index 8198e6a..0000000 --- a/meta-openstack/recipes-devtools/python/python-quantum_2013.1.3.bb +++ /dev/null @@ -1,192 +0,0 @@ -DESCRIPTION = "Quantum (virtual network service)" -HOMEPAGE = "https://launchpad.net/quantum" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" - -PR = "r0" -SRCNAME = "quantum" - -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[md5sum] = "ca410283029db2cade16c8af003f9b7f" -SRC_URI[sha256sum] = "79e60ec1aef800da3a4e1841909cdd8b2cf645979d08f27bc481957c7944e93d" - - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit setuptools update-rc.d identity hosts - -do_install_append() { - TEMPLATE_CONF_DIR=${S}${sysconfdir}/ - QUANTUM_CONF_DIR=${D}${sysconfdir}/quantum - - 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 - 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 - - echo "rabbit_host = ${CONTROLLER_IP}" >> ${WORKDIR}/quantum.conf - - for file in ovs_quantum_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} - sed -e "s:%CONTROLLER_IP%:${CONTROLLER_IP}:g" -i ${WORKDIR}/${file} - 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 -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 -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 - fi -} - -pkg_postinst_${SRCNAME} () { - if [ "x$D" != "x" ]; then - exit 1 - fi - - # This is to make sure postgres is configured and running - if ! pidof postmaster > /dev/null; then - /etc/init.d/postgresql-init - /etc/init.d/postgresql start - sleep 5 - fi - - sudo -u postgres createdb ovs_quantum -} - -pkg_postinst_${SRCNAME}-plugin-openvswitch () { - if [ "x$D" != "x" ]; then - exit 1 - fi - - /etc/init.d/openvswitch-switch start - ovs-vsctl --no-wait -- --may-exist add-br br-int -} - -PACKAGES += " \ - ${SRCNAME} \ - ${SRCNAME}-doc \ - ${SRCNAME}-server \ - ${SRCNAME}-plugin-openvswitch \ - ${SRCNAME}-plugin-linuxbridge \ - ${SRCNAME}-dhcp-agent \ - ${SRCNAME}-l3-agent \ - ${SRCNAME}-metadata-agent \ - ${SRCNAME}-extra-agents \ - " - -FILES_${PN} = "${libdir}/*" - -FILES_${SRCNAME} = " \ - ${bindir}/quantum-db-manage \ - ${bindir}/quantum-rootwrap \ - ${bindir}/quantum-debug \ - ${bindir}/quantum-netns-cleanup \ - ${bindir}/quantum-ovs-cleanup \ - ${sysconfdir}/${SRCNAME}/* \ - ${localstatedir}/* \ - " - -FILES_${SRCNAME}-server = "${bindir}/quantum-server \ - ${sysconfdir}/init.d/quantum-server \ - " - -FILES_${SRCNAME}-plugin-openvswitch = " \ - ${bindir}/quantum-openvswitch-agent \ - ${sysconfdir}/${SRCNAME}/plugins/openvswitch/ovs_quantum_plugin.ini \ - ${sysconfdir}/init.d/quantum-openvswitch-agent \ - " - -FILES_${SRCNAME}-plugin-linuxbridge = " \ - ${bindir}/quantum-linuxbridge-agent \ - ${sysconfdir}/${SRCNAME}/plugins/linuxbridge/linuxbridge_conf.ini \ - ${sysconfdir}/init.d/quantum-linuxbridge-agent \ - " - -FILES_${SRCNAME}-dhcp-agent = "${bindir}/quantum-dhcp-agent \ - ${bindir}/quantum-dhcp-agent-dnsmasq-lease-update \ - ${sysconfdir}/${SRCNAME}/dhcp_agent.ini \ - ${sysconfdir}/init.d/dhcp_agent \ - " - -FILES_${SRCNAME}-l3-agent = "${bindir}/quantum-l3-agent \ - ${sysconfdir}/${SRCNAME}/l3_agent.ini \ - ${sysconfdir}/init.d/l3_agent \ - " - -FILES_${SRCNAME}-metadata-agent = "${bindir}/quantum-metadata-agent \ - ${sysconfdir}/${SRCNAME}/metadata_agent.ini \ - ${sysconfdir}/init.d/metadata_agent \ - " - -FILES_${SRCNAME}-extra-agents = "${bindir}/*" - -FILES_${SRCNAME}-doc = "${datadir}/*" - -RDEPENDS_${PN} += "python-paste \ - python-pastedeploy \ - python-routes \ - python-amqplib \ - python-anyjson \ - python-alembic \ - python-eventlet \ - python-greenlet \ - python-httplib2 \ - python-iso8601 \ - python-kombu \ - python-netaddr \ - python-quantumclient \ - python-sqlalchemy \ - python-webob \ - python-keystoneclient \ - python-oslo.config \ - python-pyudev \ - python-novaclient \ - python-mako \ - python-markupsafe \ - python-pyparsing \ - " - -RDEPENDS_${SRCNAME} = "${PN} \ - postgresql postgresql-client python-psycopg2" - -RDEPENDS_${SRCNAME}-server = "${SRCNAME}" -RDEPENDS_${SRCNAME}-plugin-openvswitch = "${SRCNAME} openvswitch-switch " -RDEPENDS_${SRCNAME}-plugin-linuxbridge = "${SRCNAME} bridge-utils" -RDEPENDS_${SRCNAME}-dhcp-agent = "${SRCNAME} dnsmasq" -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" 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 -- cgit v1.2.3-54-g00ecf