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-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 ----------- 5 files changed, 352 deletions(-) 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 (limited to 'meta-openstack/recipes-devtools/python/python-quantum') 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 -- cgit v1.2.3-54-g00ecf