[openstack-quantum] fix helper scripts to no longer use openstack-config-set
Pádraig Brady
pbrady at fedoraproject.org
Mon May 28 01:26:18 UTC 2012
commit 69eccfde82a058ee7c2780073efc3a93b01a30f5
Author: Pádraig Brady <P at draigBrady.com>
Date: Mon May 28 02:17:58 2012 +0100
fix helper scripts to no longer use openstack-config-set
Also remove the internal quantum-config-set util.
Instead standarise on: openstack-config --set.
Bug: 824968
openstack-quantum.spec | 9 +++++----
quantum-config-set | 24 ------------------------
quantum-node-setup | 34 +++++++++++++++++-----------------
quantum-server-setup | 44 ++++++++++++++++++++++----------------------
4 files changed, 44 insertions(+), 67 deletions(-)
---
diff --git a/openstack-quantum.spec b/openstack-quantum.spec
index 3115905..34fd693 100644
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@ -4,7 +4,7 @@
Name: openstack-quantum
Version: 2012.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Virtual network service for OpenStack (quantum)
Group: Applications/System
@@ -14,7 +14,6 @@ URL: http://launchpad.net/quantum/
Source0: https://launchpad.net/quantum/essex/2012.1/+download/quantum-2012.1.tar.gz
Source1: quantum.logrotate
Source2: quantum-sudoers
-Source3: quantum-config-set
Source4: quantum-server-setup
Source5: quantum-node-setup
@@ -32,6 +31,7 @@ BuildRequires: systemd-units
BuildRequires: dos2unix
Requires: python-quantum = %{version}-%{release}
+Requires: openstack-utils
Requires(pre): shadow-utils
Requires(post): systemd-units
@@ -214,7 +214,6 @@ install -d -m 755 %{buildroot}%{_sharedstatedir}/quantum
install -d -m 755 %{buildroot}%{_localstatedir}/log/quantum
# Install setup helper scripts
-install -p -D -m 755 %{SOURCE3} %{buildroot}%{_bindir}/quantum-config-set
install -p -D -m 755 %{SOURCE4} %{buildroot}%{_bindir}/quantum-server-setup
install -p -D -m 755 %{SOURCE5} %{buildroot}%{_bindir}/quantum-node-setup
@@ -303,7 +302,6 @@ fi
%doc README
%{_bindir}/quantum-server
%{_bindir}/quantum-rootwrap
-%{_bindir}/quantum-config-set
%{_bindir}/quantum-server-setup
%{_bindir}/quantum-node-setup
%{_unitdir}/quantum-server.service
@@ -400,6 +398,9 @@ fi
%changelog
+* Mon May 28 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-2
+- Fix helper scripts to use the always available openstack-config util
+
* Mon Apr 9 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-1
- Update to essex release
diff --git a/quantum-node-setup b/quantum-node-setup
index 7e22205..3184914 100644
--- a/quantum-node-setup
+++ b/quantum-node-setup
@@ -136,26 +136,26 @@ fi
case "${QUANTUM_PLUGIN}" in
"cisco")
- quantum-config-set ${CISCO_CONF} DATABASE user ${QUANTUM_USER}
- quantum-config-set ${CISCO_CONF} DATABASE pass ${MYSQL_Q_PW}
- quantum-config-set ${CISCO_CONF} DATABASE host ${QUANTUM_HOST}
+ openstack-config --set ${CISCO_CONF} DATABASE user ${QUANTUM_USER}
+ openstack-config --set ${CISCO_CONF} DATABASE pass ${MYSQL_Q_PW}
+ openstack-config --set ${CISCO_CONF} DATABASE host ${QUANTUM_HOST}
SCHEDULER_DRIVER=quantum.plugins.cisco.nova.quantum_port_aware_scheduler.QuantumPortAwareScheduler
LIBVIRT_VIF_DRIVER=quantum.plugins.cisco.nova.vifdirect.Libvirt802dot1QbhDriver
LIBVIRT_VIF_TYPE=802.1Qbh
;;
"linuxbridge")
- quantum-config-set ${LB_CONF} DATABASE connection mysql
- quantum-config-set ${LB_CONF} DATABASE user ${QUANTUM_USER}
- quantum-config-set ${LB_CONF} DATABASE pass ${MYSQL_Q_PW}
- quantum-config-set ${LB_CONF} DATABASE host ${QUANTUM_HOST}
+ openstack-config --set ${LB_CONF} DATABASE connection mysql
+ openstack-config --set ${LB_CONF} DATABASE user ${QUANTUM_USER}
+ openstack-config --set ${LB_CONF} DATABASE pass ${MYSQL_Q_PW}
+ openstack-config --set ${LB_CONF} DATABASE host ${QUANTUM_HOST}
LIBVIRT_VIF_TYPE=ethernet
LIBVIRT_VIF_DRIVER=nova.virt.libvirt.vif.QuantumLinuxBridgeVIFDriver
LINUX_INTERFACE_DRIVER=nova.network.linux_net.QuantumLinuxBridgeInterfaceDriver
echo "Please enter network device for VLAN trunking:"
read NETWORK_DEVICE
- quantum-config-set ${LB_CONF} LINUX_BRIDGE physical_interface ${NETWORK_DEVICE}
+ openstack-config --set ${LB_CONF} LINUX_BRIDGE physical_interface ${NETWORK_DEVICE}
;;
"nicira")
@@ -169,7 +169,7 @@ case "${QUANTUM_PLUGIN}" in
echo "Please install openvswitch"
exit 0
fi
- quantum-config-set ${OVS_CONF} DATABASE sql_connection mysql://${QUANTUM_USER}:${MYSQL_Q_PW}@${QUANTUM_HOST}/ovs_quantum
+ openstack-config --set ${OVS_CONF} DATABASE sql_connection mysql://${QUANTUM_USER}:${MYSQL_Q_PW}@${QUANTUM_HOST}/ovs_quantum
LIBVIRT_VIF_TYPE=ethernet
LIBVIRT_VIF_DRIVER=nova.virt.libvirt.vif.LibvirtOpenVswitchDriver
LINUX_INTERFACE_DRIVER=nova.network.linux_net.LinuxOVSInterfaceDriver
@@ -204,21 +204,21 @@ if ! [ -e "${NOVA_CONF}" ]; then
echo "libvirt_vif_type ${LIBVIRT_VIF_TYPE}"
echo "linuxnet_interface_driver ${LINUX_INTERFACE_DRIVER}"
else
- openstack-config-set ${NOVA_CONF} DEFAULT network_manager nova.network.quantum.manager.QuantumManager
- openstack-config-set ${NOVA_CONF} DEFAULT quantum_connection_host ${QUANTUM_HOST}
- openstack-config-set ${NOVA_CONF} DEFAULT quantum_connection_port 9696
- openstack-config-set ${NOVA_CONF} DEFAULT quantum_use_dhcp True
+ openstack-config --set ${NOVA_CONF} DEFAULT network_manager nova.network.quantum.manager.QuantumManager
+ openstack-config --set ${NOVA_CONF} DEFAULT quantum_connection_host ${QUANTUM_HOST}
+ openstack-config --set ${NOVA_CONF} DEFAULT quantum_connection_port 9696
+ openstack-config --set ${NOVA_CONF} DEFAULT quantum_use_dhcp True
if [ ${SCHEDULER_DRIVER} ]; then
- openstack-config-set ${NOVA_CONF} DEFAULT scheduler_driver ${SCHEDULER_DRIVER}
+ openstack-config --set ${NOVA_CONF} DEFAULT scheduler_driver ${SCHEDULER_DRIVER}
fi
if [ ${LIBVIRT_VIF_DRIVER} ]; then
- openstack-config-set ${NOVA_CONF} DEFAULT libvirt_vif_driver ${LIBVIRT_VIF_DRIVER}
+ openstack-config --set ${NOVA_CONF} DEFAULT libvirt_vif_driver ${LIBVIRT_VIF_DRIVER}
fi
if [ ${LIBVIRT_VIF_TYPE} ]; then
- openstack-config-set ${NOVA_CONF} DEFAULT libvirt_vif_type ${LIBVIRT_VIF_TYPE}
+ openstack-config --set ${NOVA_CONF} DEFAULT libvirt_vif_type ${LIBVIRT_VIF_TYPE}
fi
if [ ${LINUX_INTERFACE_DRIVER} ]; then
- openstack-config-set ${NOVA_CONF} DEFAULT linuxnet_interface_driver ${LINUX_INTERFACE_DRIVER}
+ openstack-config --set ${NOVA_CONF} DEFAULT linuxnet_interface_driver ${LINUX_INTERFACE_DRIVER}
fi
fi
diff --git a/quantum-server-setup b/quantum-server-setup
index 577983f..0e78062 100644
--- a/quantum-server-setup
+++ b/quantum-server-setup
@@ -159,16 +159,16 @@ fi
case "${QUANTUM_PLUGIN}" in
"cisco")
DB_NAME="quantum_l2network"
- quantum-config-set ${Q_CONF} PLUGIN provider quantum.plugins.cisco.l2network_plugin.L2Network
+ openstack-config --set ${Q_CONF} PLUGIN provider quantum.plugins.cisco.l2network_plugin.L2Network
;;
"linuxbridge")
DB_NAME="quantum_linux_bridge"
- quantum-config-set ${Q_CONF} PLUGIN provider quantum.plugins.linuxbridge.LinuxBridgePlugin.LinuxBridgePlugin
+ openstack-config --set ${Q_CONF} PLUGIN provider quantum.plugins.linuxbridge.LinuxBridgePlugin.LinuxBridgePlugin
;;
"nicira")
- quantum-config-set ${Q_CONF} PLUGIN provider quantum.plugins.nicira.nicira_nvp_plugin.QuantumPlugin.NvpPlugin
+ openstack-config --set ${Q_CONF} PLUGIN provider quantum.plugins.nicira.nicira_nvp_plugin.QuantumPlugin.NvpPlugin
echo "No database support"
exit 0;
;;
@@ -180,11 +180,11 @@ case "${QUANTUM_PLUGIN}" in
exit 0
fi
DB_NAME="ovs_quantum"
- quantum-config-set ${Q_CONF} PLUGIN provider quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPlugin
+ openstack-config --set ${Q_CONF} PLUGIN provider quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPlugin
;;
"ryu")
- quantum-config-set ${Q_CONF} PLUGIN provider quantum.plugins.ryu.ryu_quantum_plugin.RyuQuantumPlugin
+ openstack-config --set ${Q_CONF} PLUGIN provider quantum.plugins.ryu.ryu_quantum_plugin.RyuQuantumPlugin
echo "No database support required"
exit 0;
;;
@@ -312,9 +312,9 @@ mysql -u root ${MYSQL_ROOT_PW_ARG} -e "create database ${DB_NAME}"
# Configure database specifics
case "${QUANTUM_PLUGIN}" in
"cisco")
- quantum-config-set ${CISCO_CONF} DATABASE user ${QUANTUM_USER}
- quantum-config-set ${CISCO_CONF} DATABASE pass ${MYSQL_Q_PW}
- quantum-config-set ${CISCO_CONF} DATABASE host `hostname`
+ openstack-config --set ${CISCO_CONF} DATABASE user ${QUANTUM_USER}
+ openstack-config --set ${CISCO_CONF} DATABASE pass ${MYSQL_Q_PW}
+ openstack-config --set ${CISCO_CONF} DATABASE host `hostname`
SCHEDULER_DRIVER=quantum.plugins.cisco.nova.quantum_port_aware_scheduler.QuantumPortAwareScheduler
LIBVIRT_VIF_DRIVER=quantum.plugins.cisco.nova.vifdirect.Libvirt802dot1QbhDriver
LIBVIRT_VIF_TYPE=802.1Qbh
@@ -323,14 +323,14 @@ case "${QUANTUM_PLUGIN}" in
"linuxbridge")
mysql -u root ${MYSQL_ROOT_PW_ARG} -e "grant all on quantum_linux_bridge.* to '${QUANTUM_USER}'@'%'"
mysql -u root ${MYSQL_ROOT_PW_ARG} -e "grant all on quantum_linux_bridge.* to '${QUANTUM_USER}'@'localhost'"
- quantum-config-set ${LB_CONF} DATABASE connection mysql
- quantum-config-set ${LB_CONF} DATABASE user ${QUANTUM_USER}
- quantum-config-set ${LB_CONF} DATABASE pass ${MYSQL_Q_PW}
- quantum-config-set ${LB_CONF} DATABASE host `hostname`
+ openstack-config --set ${LB_CONF} DATABASE connection mysql
+ openstack-config --set ${LB_CONF} DATABASE user ${QUANTUM_USER}
+ openstack-config --set ${LB_CONF} DATABASE pass ${MYSQL_Q_PW}
+ openstack-config --set ${LB_CONF} DATABASE host `hostname`
echo "Please enter network device for VLAN trunking:"
read NETWORK_DEVICE
- quantum-config-set ${LB_CONF} LINUX_BRIDGE physical_interface ${NETWORK_DEVICE}
+ openstack-config --set ${LB_CONF} LINUX_BRIDGE physical_interface ${NETWORK_DEVICE}
LIBVIRT_VIF_TYPE=ethernet
LIBVIRT_VIF_DRIVER=nova.virt.libvirt.vif.QuantumLinuxBridgeVIFDriver
@@ -340,7 +340,7 @@ case "${QUANTUM_PLUGIN}" in
"openvswitch")
mysql -u root ${MYSQL_ROOT_PW_ARG} -e "grant all on ovs_quantum.* to '${QUANTUM_USER}'@'%'"
mysql -u root ${MYSQL_ROOT_PW_ARG} -e "grant all on ovs_quantum.* to '${QUANTUM_USER}'@'localhost'"
- quantum-config-set ${OVS_CONF} DATABASE sql_connection mysql://${QUANTUM_USER}:${MYSQL_Q_PW}@`hostname`/ovs_quantum
+ openstack-config --set ${OVS_CONF} DATABASE sql_connection mysql://${QUANTUM_USER}:${MYSQL_Q_PW}@`hostname`/ovs_quantum
LIBVIRT_VIF_TYPE=ethernet
LIBVIRT_VIF_DRIVER=nova.virt.libvirt.vif.LibvirtOpenVswitchDriver
LINUX_INTERFACE_DRIVER=nova.network.linux_net.LinuxOVSInterfaceDriver
@@ -370,21 +370,21 @@ if ! [ -e "${NOVA_CONF}" ]; then
echo " libvirt_vif_type=${LIBVIRT_VIF_TYPE}"
echo " linuxnet_interface_driver=${LINUX_INTERFACE_DRIVER}"
else
- openstack-config-set ${NOVA_CONF} DEFAULT network_manager nova.network.quantum.manager.QuantumManager
- openstack-config-set ${NOVA_CONF} DEFAULT quantum_connection_host `hostname`
- openstack-config-set ${NOVA_CONF} DEFAULT quantum_connection_port 9696
- openstack-config-set ${NOVA_CONF} DEFAULT quantum_use_dhcp True
+ openstack-config --set ${NOVA_CONF} DEFAULT network_manager nova.network.quantum.manager.QuantumManager
+ openstack-config --set ${NOVA_CONF} DEFAULT quantum_connection_host `hostname`
+ openstack-config --set ${NOVA_CONF} DEFAULT quantum_connection_port 9696
+ openstack-config --set ${NOVA_CONF} DEFAULT quantum_use_dhcp True
if [ ${SCHEDULER_DRIVER} ]; then
- openstack-config-set ${NOVA_CONF} DEFAULT scheduler_driver ${SCHEDULER_DRIVER}
+ openstack-config --set ${NOVA_CONF} DEFAULT scheduler_driver ${SCHEDULER_DRIVER}
fi
if [ ${LIBVIRT_VIF_DRIVER} ]; then
- openstack-config-set ${NOVA_CONF} DEFAULT libvirt_vif_driver ${LIBVIRT_VIF_DRIVER}
+ openstack-config --set ${NOVA_CONF} DEFAULT libvirt_vif_driver ${LIBVIRT_VIF_DRIVER}
fi
if [ ${LIBVIRT_VIF_TYPE} ]; then
- openstack-config-set ${NOVA_CONF} DEFAULT libvirt_vif_type ${LIBVIRT_VIF_TYPE}
+ openstack-config --set ${NOVA_CONF} DEFAULT libvirt_vif_type ${LIBVIRT_VIF_TYPE}
fi
if [ ${LINUX_INTERFACE_DRIVER} ]; then
- openstack-config-set ${NOVA_CONF} DEFAULT linuxnet_interface_driver ${LINUX_INTERFACE_DRIVER}
+ openstack-config --set ${NOVA_CONF} DEFAULT linuxnet_interface_driver ${LINUX_INTERFACE_DRIVER}
fi
fi
More information about the scm-commits
mailing list