[openstack-neutron/f20] sync up quantum renaming changes from el6 branch
Pádraig Brady
pbrady at fedoraproject.org
Wed Feb 19 15:58:49 UTC 2014
commit 48350070c3e18908d5637756c264e30bdbbaa3d7
Author: Pádraig Brady <P at draigBrady.com>
Date: Wed Feb 19 15:40:49 2014 +0000
sync up quantum renaming changes from el6 branch
Also sync updated neutronclient version dependency
neutron-dhcp-agent.service | 2 +-
neutron-dhcp-setup | 18 +++++++-------
neutron-l3-agent.service | 2 +-
neutron-l3-setup | 18 +++++++-------
neutron-lbaas-agent.service | 2 +-
neutron-linuxbridge-agent.service | 2 +-
neutron-metadata-agent.service | 2 +-
neutron-mlnx-agent.service | 2 +-
neutron-nec-agent.service | 2 +-
neutron-node-setup | 24 +++++++++---------
neutron-openvswitch-agent.service | 2 +-
neutron-ovs-cleanup.service | 2 +-
neutron-ryu-agent.service | 2 +-
neutron-server-setup | 48 ++++++++++++++++++------------------
neutron-server.service | 2 +-
openstack-neutron.spec | 15 ++++++++---
16 files changed, 76 insertions(+), 69 deletions(-)
---
diff --git a/neutron-dhcp-agent.service b/neutron-dhcp-agent.service
index 211b296..c0088bc 100644
--- a/neutron-dhcp-agent.service
+++ b/neutron-dhcp-agent.service
@@ -1,5 +1,5 @@
[Unit]
-Description=OpenStack Quantum DHCP Agent
+Description=OpenStack Neutron DHCP Agent
After=syslog.target network.target
[Service]
diff --git a/neutron-dhcp-setup b/neutron-dhcp-setup
index 49b9847..4055768 100755
--- a/neutron-dhcp-setup
+++ b/neutron-dhcp-setup
@@ -34,7 +34,7 @@ Options:
The neutron plugin. Supported plugins:-
${SUPPORTED_PLUGINS[*]}
--qhost | -q
- The Quantum hostname (assumes that this is also the QPID host).
+ The Neutron hostname (assumes that this is also the QPID host).
EOF
exit 0
@@ -60,7 +60,7 @@ do
;;
-p|--plugin)
shift
- QUANTUM_PLUGIN=${1}
+ NEUTRON_PLUGIN=${1}
;;
-q|--qhost)
shift
@@ -75,24 +75,24 @@ do
done
# if the plugin is not defined
-if [ -z ${QUANTUM_PLUGIN} ] ; then
+if [ -z ${NEUTRON_PLUGIN} ] ; then
echo "Please select a plugin from: ${SUPPORTED_PLUGINS[*]}"
echo "Choice:"
- read QUANTUM_PLUGIN
+ read NEUTRON_PLUGIN
fi
# check that the plugin is valid
-is_valid_plugin ${QUANTUM_PLUGIN}
+is_valid_plugin ${NEUTRON_PLUGIN}
if [ $? -ne 0 ]; then
- echo "Plugin '${QUANTUM_PLUGIN}' not supported. Supported plugins:-"
+ echo "Plugin '${NEUTRON_PLUGIN}' not supported. Supported plugins:-"
echo " ${SUPPORTED_PLUGINS[*]}"
exit 0
fi
-echo "Quantum plugin: ${QUANTUM_PLUGIN}"
+echo "Neutron plugin: ${NEUTRON_PLUGIN}"
if [ -z ${Q_HOST} ] ; then
- echo "Please enter the Quantum hostname:"
+ echo "Please enter the Neutron hostname:"
read Q_HOST
fi
@@ -102,7 +102,7 @@ Q_CONF=/etc/neutron/neutron.conf
openstack-config --set ${Q_CONF} DEFAULT rpc_backend neutron.openstack.common.rpc.impl_qpid
openstack-config --set ${Q_CONF} DEFAULT qpid_hostname ${Q_HOST}
-case "${QUANTUM_PLUGIN}" in
+case "${NEUTRON_PLUGIN}" in
"linuxbridge")
LINUX_INTERFACE_DRIVER=neutron.agent.linux.interface.BridgeInterfaceDriver
;;
diff --git a/neutron-l3-agent.service b/neutron-l3-agent.service
index 79a31e6..9b9da5c 100644
--- a/neutron-l3-agent.service
+++ b/neutron-l3-agent.service
@@ -1,5 +1,5 @@
[Unit]
-Description=OpenStack Quantum Layer 3 Agent
+Description=OpenStack Neutron Layer 3 Agent
After=syslog.target network.target
[Service]
diff --git a/neutron-l3-setup b/neutron-l3-setup
index f588274..44cdf0e 100755
--- a/neutron-l3-setup
+++ b/neutron-l3-setup
@@ -34,7 +34,7 @@ Options:
The neutron plugin. Supported plugins:-
${SUPPORTED_PLUGINS[*]}
--qhost | -q
- The Quantum hostname (assumes that this is also the QPID host).
+ The Neutron hostname (assumes that this is also the QPID host).
EOF
exit 0
@@ -61,7 +61,7 @@ do
;;
-p|--plugin)
shift
- QUANTUM_PLUGIN=${1}
+ NEUTRON_PLUGIN=${1}
;;
-q|--qhost)
shift
@@ -76,24 +76,24 @@ do
done
# if the plugin is not defined
-if [ -z ${QUANTUM_PLUGIN} ] ; then
+if [ -z ${NEUTRON_PLUGIN} ] ; then
echo "Please select a plugin from: ${SUPPORTED_PLUGINS[*]}"
echo "Choice:"
- read QUANTUM_PLUGIN
+ read NEUTRON_PLUGIN
fi
# check that the plugin is valid
-is_valid_plugin ${QUANTUM_PLUGIN}
+is_valid_plugin ${NEUTRON_PLUGIN}
if [ $? -ne 0 ]; then
- echo "Plugin '${QUANTUM_PLUGIN}' not supported. Supported plugins:-"
+ echo "Plugin '${NEUTRON_PLUGIN}' not supported. Supported plugins:-"
echo " ${SUPPORTED_PLUGINS[*]}"
exit 0
fi
-echo "Quantum plugin: ${QUANTUM_PLUGIN}"
+echo "Neutron plugin: ${NEUTRON_PLUGIN}"
if [ -z ${Q_HOST} ] ; then
- echo "Please enter the Quantum hostname:"
+ echo "Please enter the Neutron hostname:"
read Q_HOST
fi
@@ -103,7 +103,7 @@ Q_CONF=/etc/neutron/neutron.conf
openstack-config --set ${Q_CONF} DEFAULT rpc_backend neutron.openstack.common.rpc.impl_qpid
openstack-config --set ${Q_CONF} DEFAULT qpid_hostname ${Q_HOST}
-case "${QUANTUM_PLUGIN}" in
+case "${NEUTRON_PLUGIN}" in
"linuxbridge")
LINUX_INTERFACE_DRIVER=neutron.agent.linux.interface.BridgeInterfaceDriver
openstack-config --set ${L3_CONF} DEFAULT external_network_bridge ''
diff --git a/neutron-lbaas-agent.service b/neutron-lbaas-agent.service
index e784ecb..b6f1731 100644
--- a/neutron-lbaas-agent.service
+++ b/neutron-lbaas-agent.service
@@ -1,5 +1,5 @@
[Unit]
-Description=OpenStack Quantum Load Balancing as a Service Agent
+Description=OpenStack Neutron Load Balancing as a Service Agent
After=syslog.target network.target
[Service]
diff --git a/neutron-linuxbridge-agent.service b/neutron-linuxbridge-agent.service
index 3ee92b0..cf8a092 100644
--- a/neutron-linuxbridge-agent.service
+++ b/neutron-linuxbridge-agent.service
@@ -1,5 +1,5 @@
[Unit]
-Description=OpenStack Quantum Linux Bridge Agent
+Description=OpenStack Neutron Linux Bridge Agent
After=syslog.target network.target
[Service]
diff --git a/neutron-metadata-agent.service b/neutron-metadata-agent.service
index 22852c0..6df1501 100644
--- a/neutron-metadata-agent.service
+++ b/neutron-metadata-agent.service
@@ -1,5 +1,5 @@
[Unit]
-Description=OpenStack Quantum Metadata Agent
+Description=OpenStack Neutron Metadata Agent
After=syslog.target network.target
[Service]
diff --git a/neutron-mlnx-agent.service b/neutron-mlnx-agent.service
index f41ce82..8ac77f7 100644
--- a/neutron-mlnx-agent.service
+++ b/neutron-mlnx-agent.service
@@ -1,5 +1,5 @@
[Unit]
-Description=OpenStack Quantum Mellanox Agent
+Description=OpenStack Neutron Mellanox Agent
After=syslog.target network.target
[Service]
diff --git a/neutron-nec-agent.service b/neutron-nec-agent.service
index eedcb12..e156371 100644
--- a/neutron-nec-agent.service
+++ b/neutron-nec-agent.service
@@ -1,5 +1,5 @@
[Unit]
-Description=OpenStack Quantum NEC OpenFlow Agent
+Description=OpenStack Neutron NEC OpenFlow Agent
After=syslog.target network.target
[Service]
diff --git a/neutron-node-setup b/neutron-node-setup
index 280be3f..de051ad 100755
--- a/neutron-node-setup
+++ b/neutron-node-setup
@@ -34,7 +34,7 @@ Options:
The neutron plugin. Supported plugins:-
${SUPPORTED_PLUGINS[*]}
--qhost | -q
- The Quantum hostname (assumes that this is also the QPID host).
+ The Neutron hostname (assumes that this is also the QPID host).
EOF
exit 0
@@ -50,7 +50,7 @@ is_valid_plugin() {
return 1
}
-QUANTUM_USER=neutron
+NEUTRON_USER=neutron
LB_CONF=/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
OVS_CONF=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
@@ -65,7 +65,7 @@ do
;;
-p|--plugin)
shift
- QUANTUM_PLUGIN=${1}
+ NEUTRON_PLUGIN=${1}
;;
-q|--qhost)
shift
@@ -80,30 +80,30 @@ do
done
# if the plugin is not defined
-if [ -z ${QUANTUM_PLUGIN} ] ; then
+if [ -z ${NEUTRON_PLUGIN} ] ; then
echo "Please select a plugin from: ${SUPPORTED_PLUGINS[*]}"
echo "Choice:"
- read QUANTUM_PLUGIN
+ read NEUTRON_PLUGIN
fi
# check that the plugin is valid
-is_valid_plugin ${QUANTUM_PLUGIN}
+is_valid_plugin ${NEUTRON_PLUGIN}
if [ $? -ne 0 ]; then
- echo "Plugin '${QUANTUM_PLUGIN}' not supported. Supported plugins:-"
+ echo "Plugin '${NEUTRON_PLUGIN}' not supported. Supported plugins:-"
echo " ${SUPPORTED_PLUGINS[*]}"
exit 0
fi
-echo "Quantum plugin: ${QUANTUM_PLUGIN}"
+echo "Neutron plugin: ${NEUTRON_PLUGIN}"
-if ! [ -e "/etc/neutron/plugins/${QUANTUM_PLUGIN}" ]; then
- echo "Please install the ${QUANTUM_PLUGIN} neutron plugin"
+if ! [ -e "/etc/neutron/plugins/${NEUTRON_PLUGIN}" ]; then
+ echo "Please install the ${NEUTRON_PLUGIN} neutron plugin"
exit 0
fi
#if the database hostname and is not defined and is required
if [ -z ${Q_HOST} ] ; then
- echo "Please enter the Quantum hostname:"
+ echo "Please enter the Neutron hostname:"
read Q_HOST
fi
@@ -113,7 +113,7 @@ Q_CONF=/etc/neutron/neutron.conf
openstack-config --set ${Q_CONF} DEFAULT rpc_backend neutron.openstack.common.rpc.impl_qpid
openstack-config --set ${Q_CONF} DEFAULT qpid_hostname ${Q_HOST}
-case "${QUANTUM_PLUGIN}" in
+case "${NEUTRON_PLUGIN}" in
"linuxbridge")
;;
diff --git a/neutron-openvswitch-agent.service b/neutron-openvswitch-agent.service
index 0235b69..4ccb82e 100644
--- a/neutron-openvswitch-agent.service
+++ b/neutron-openvswitch-agent.service
@@ -1,5 +1,5 @@
[Unit]
-Description=OpenStack Quantum Open vSwitch Agent
+Description=OpenStack Neutron Open vSwitch Agent
After=syslog.target network.target
[Service]
diff --git a/neutron-ovs-cleanup.service b/neutron-ovs-cleanup.service
index 4c1b4ee..33890f6 100644
--- a/neutron-ovs-cleanup.service
+++ b/neutron-ovs-cleanup.service
@@ -1,5 +1,5 @@
[Unit]
-Description=OpenStack Quantum Open vSwitch Cleanup Utility
+Description=OpenStack Neutron Open vSwitch Cleanup Utility
After=syslog.target network.target openvswitch.service
Before=neutron-openvswitch-agent.service neutron-dhcp-agent.service neutron-l3-agent.service openstack-nova-compute.service
diff --git a/neutron-ryu-agent.service b/neutron-ryu-agent.service
index af84110..f1beb6b 100644
--- a/neutron-ryu-agent.service
+++ b/neutron-ryu-agent.service
@@ -1,5 +1,5 @@
[Unit]
-Description=OpenStack Quantum Ryu Network Operating System Agent
+Description=OpenStack Neutron Ryu Network Operating System Agent
After=syslog.target network.target
[Service]
diff --git a/neutron-server-setup b/neutron-server-setup
index c51bc93..268c64c 100755
--- a/neutron-server-setup
+++ b/neutron-server-setup
@@ -82,7 +82,7 @@ is_valid_plugin() {
}
ASSUME_YES=""
-QUANTUM_USER=neutron
+NEUTRON_USER=neutron
MYSQL_Q_PW=neutron
Q_CONF=/etc/neutron/neutron.conf
LB_CONF=/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
@@ -119,11 +119,11 @@ do
;;
-u|--user)
shift
- QUANTUM_USER=${1}
+ NEUTRON_USER=${1}
;;
-p|--plugin)
shift
- QUANTUM_PLUGIN=${1}
+ NEUTRON_PLUGIN=${1}
;;
*)
# ignore
@@ -134,33 +134,33 @@ do
done
# if the plugin is not defined
-if [ -z ${QUANTUM_PLUGIN} ] ; then
+if [ -z ${NEUTRON_PLUGIN} ] ; then
echo "Please select a plugin from: ${SUPPORTED_PLUGINS[*]}"
echo "Choice:"
- read QUANTUM_PLUGIN
+ read NEUTRON_PLUGIN
fi
# check that the plugin is valid
-is_valid_plugin ${QUANTUM_PLUGIN}
+is_valid_plugin ${NEUTRON_PLUGIN}
if [ $? -ne 0 ]; then
- echo "Plugin '${QUANTUM_PLUGIN}' not supported. Supported plugins:-"
+ echo "Plugin '${NEUTRON_PLUGIN}' not supported. Supported plugins:-"
echo " ${SUPPORTED_PLUGINS[*]}"
exit 0
fi
-echo "Quantum plugin: ${QUANTUM_PLUGIN}"
+echo "Neutron plugin: ${NEUTRON_PLUGIN}"
if ! [ -e "${Q_CONF}" ]; then
echo "Please install the neutron package"
exit 0
fi
-if ! [ -e "/etc/neutron/plugins/${QUANTUM_PLUGIN}" ]; then
- echo "Please install the ${QUANTUM_PLUGIN} neutron plugin"
+if ! [ -e "/etc/neutron/plugins/${NEUTRON_PLUGIN}" ]; then
+ echo "Please install the ${NEUTRON_PLUGIN} neutron plugin"
exit 0
fi
-case "${QUANTUM_PLUGIN}" in
+case "${NEUTRON_PLUGIN}" in
"linuxbridge")
DB_NAME="neutron_linux_bridge"
Q_PLUGIN_CLASS="neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2"
@@ -173,7 +173,7 @@ case "${QUANTUM_PLUGIN}" in
exit 0
fi
DB_NAME="ovs_neutron"
- Q_PLUGIN_CLASS="neutron.plugins.openvswitch.ovs_neutron_plugin.OVSQuantumPluginV2"
+ Q_PLUGIN_CLASS="neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2"
;;
esac
@@ -194,7 +194,7 @@ openstack-config --set ${Q_CONF} keystone_authtoken admin_tenant_name ${OS_TENAN
openstack-config --set ${Q_CONF} keystone_authtoken admin_user ${OS_USERNAME}
openstack-config --set ${Q_CONF} keystone_authtoken admin_password ${OS_PASSWORD}
-echo "Plugin: ${QUANTUM_PLUGIN} => Database: ${DB_NAME}"
+echo "Plugin: ${NEUTRON_PLUGIN} => Database: ${DB_NAME}"
# Make sure MySQL is installed.
@@ -298,12 +298,12 @@ fi
echo "Verified connectivity to MySQL."
# Create a database user - check if it does not exist prior
-USER_EXISTS=$(mysql -u root ${MYSQL_ROOT_PW_ARG} -e "SELECT user FROM mysql.user WHERE user='${QUANTUM_USER}'"|grep ${QUANTUM_USER} | wc -l)
+USER_EXISTS=$(mysql -u root ${MYSQL_ROOT_PW_ARG} -e "SELECT user FROM mysql.user WHERE user='${NEUTRON_USER}'"|grep ${NEUTRON_USER} | wc -l)
if [ ${USER_EXISTS} -ne 0 ]; then
- echo "User ${QUANTUM_USER} already exists"
+ echo "User ${NEUTRON_USER} already exists"
else
- mysql -u root ${MYSQL_ROOT_PW_ARG} -e "create user '${QUANTUM_USER}'@'%' identified by '${MYSQL_Q_PW}'"
- mysql -u root ${MYSQL_ROOT_PW_ARG} -e "create user '${QUANTUM_USER}'@'localhost' identified by '${MYSQL_Q_PW}'"
+ mysql -u root ${MYSQL_ROOT_PW_ARG} -e "create user '${NEUTRON_USER}'@'%' identified by '${MYSQL_Q_PW}'"
+ mysql -u root ${MYSQL_ROOT_PW_ARG} -e "create user '${NEUTRON_USER}'@'localhost' identified by '${MYSQL_Q_PW}'"
fi
#create database
@@ -314,11 +314,11 @@ fi
mysql -u root ${MYSQL_ROOT_PW_ARG} -e "create database ${DB_NAME}"
# Configure database specifics
-case "${QUANTUM_PLUGIN}" in
+case "${NEUTRON_PLUGIN}" in
"linuxbridge")
- mysql -u root ${MYSQL_ROOT_PW_ARG} -e "grant all on neutron_linux_bridge.* to '${QUANTUM_USER}'@'%'"
- mysql -u root ${MYSQL_ROOT_PW_ARG} -e "grant all on neutron_linux_bridge.* to '${QUANTUM_USER}'@'localhost'"
- openstack-config --set ${LB_CONF} DATABASE sql_connection mysql://${QUANTUM_USER}:${MYSQL_Q_PW}@`hostname`/neutron_linux_bridge
+ mysql -u root ${MYSQL_ROOT_PW_ARG} -e "grant all on neutron_linux_bridge.* to '${NEUTRON_USER}'@'%'"
+ mysql -u root ${MYSQL_ROOT_PW_ARG} -e "grant all on neutron_linux_bridge.* to '${NEUTRON_USER}'@'localhost'"
+ openstack-config --set ${LB_CONF} DATABASE sql_connection mysql://${NEUTRON_USER}:${MYSQL_Q_PW}@`hostname`/neutron_linux_bridge
echo "Please enter network device for VLAN trunking:"
read NETWORK_DEVICE
@@ -328,9 +328,9 @@ case "${QUANTUM_PLUGIN}" in
;;
"openvswitch")
- mysql -u root ${MYSQL_ROOT_PW_ARG} -e "grant all on ovs_neutron.* to '${QUANTUM_USER}'@'%'"
- mysql -u root ${MYSQL_ROOT_PW_ARG} -e "grant all on ovs_neutron.* to '${QUANTUM_USER}'@'localhost'"
- openstack-config --set ${OVS_CONF} DATABASE sql_connection mysql://${QUANTUM_USER}:${MYSQL_Q_PW}@`hostname`/ovs_neutron
+ mysql -u root ${MYSQL_ROOT_PW_ARG} -e "grant all on ovs_neutron.* to '${NEUTRON_USER}'@'%'"
+ mysql -u root ${MYSQL_ROOT_PW_ARG} -e "grant all on ovs_neutron.* to '${NEUTRON_USER}'@'localhost'"
+ openstack-config --set ${OVS_CONF} DATABASE sql_connection mysql://${NEUTRON_USER}:${MYSQL_Q_PW}@`hostname`/ovs_neutron
openstack-config --set ${OVS_CONF} SECURITYGROUP firewall_driver neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
ln -s ${OVS_CONF} /etc/neutron/plugin.ini
;;
diff --git a/neutron-server.service b/neutron-server.service
index 20feb40..0647e05 100644
--- a/neutron-server.service
+++ b/neutron-server.service
@@ -1,5 +1,5 @@
[Unit]
-Description=OpenStack Quantum Server
+Description=OpenStack Neutron Server
After=syslog.target network.target
[Service]
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index ee21b57..3c7ab57 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -2,7 +2,7 @@
Name: openstack-neutron
Version: 2013.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Provides: openstack-quantum = %{version}-%{release}
Obsoletes: openstack-quantum < 2013.2-0.4.b3
Summary: OpenStack Networking Service
@@ -92,7 +92,7 @@ Requires: python-netaddr
Requires: python-oslo-config >= 1:1.2.0
Requires: python-paste-deploy
Requires: python-qpid
-Requires: python-neutronclient >= 2.1.10
+Requires: python-neutronclient >= 2.3.0
Requires: python-routes
Requires: python-sqlalchemy
Requires: python-webob
@@ -393,6 +393,12 @@ IPSec.
find neutron -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
+# Ensure SOURCES.txt ends in a newline and if any patches have added files, append them to SOURCES.txt
+[ -n "$(tail -c 1 < neutron.egg-info/SOURCES.txt)" ] && echo >> neutron.egg-info/SOURCES.txt
+if ls %{_sourcedir}/*.patch >/dev/null 2>&1; then
+ awk '/^new file/ {split(a,files," ");print substr(files[3],3)} {a = $0}' %{_sourcedir}/*.patch >> neutron.egg-info/SOURCES.txt
+fi
+
chmod 644 neutron/plugins/cisco/README
# Let's handle dependencies ourseleves
@@ -740,8 +746,8 @@ fi
%files -n python-neutron
%doc LICENSE
%doc README.rst
-%{python_sitelib}/quantum
%{python_sitelib}/neutron
+%{python_sitelib}/quantum
%exclude %{python_sitelib}/neutron/plugins/bigswitch
%exclude %{python_sitelib}/neutron/plugins/brocade
%exclude %{python_sitelib}/neutron/plugins/cisco
@@ -912,8 +918,9 @@ fi
%changelog
-* Wed Feb 19 2014 Pádraig Brady <pbrady at redhat.com> - 2013.2.2-1
+* Wed Feb 19 2014 Pádraig Brady <pbrady at redhat.com> - 2013.2.2-2
- Update to havana stable release 2013.2.2
+- Sync up Quantum renaming changes from el6 branch
* Fri Jan 24 2014 Terry Wilson <twilson at redhat.com> - 2013.2.1-3
- Remove requirements.txt, bz#1057615
More information about the scm-commits
mailing list