[openstack-neutron: 38/53] Update to grizzly release
Terry Wilson
otherwiseguy at fedoraproject.org
Mon Aug 19 19:56:37 UTC 2013
commit 06f99ee0eaeded43e7186118ed76dbf711df3474
Author: Gary Kotton <gkotton at redhat.com>
Date: Mon May 13 02:34:59 2013 -0400
Update to grizzly release
- Update install scripts to configure security groups
- Update install scripts to remove virtual interface configurations
.gitignore | 1 +
openstack-quantum.spec | 9 +++++++--
quantum-node-setup | 9 ++++++---
quantum-server-setup | 11 +++++------
sources | 2 +-
5 files changed, 20 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 750adde..c16bc0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/quantum-2013.1.g3.tar.gz
/quantum-2013.1.rc2.tar.gz
+/quantum-2013.1.1.tar.gz
diff --git a/openstack-quantum.spec b/openstack-quantum.spec
index 46ee2d4..2dc9fff 100644
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@ -4,8 +4,8 @@
%global release_name grizzly
Name: openstack-quantum
-Version: 2013.1
-Release: 1%{?dist}
+Version: 2013.1.1
+Release: 2%{?dist}
Summary: OpenStack Networking Service
Group: Applications/System
@@ -678,6 +678,11 @@ fi
%changelog
+* Mon May 13 2013 Gary Kotton <gkotton at redhat.com> - 2013.1-2
+- Update to grizzly release
+- Update install scripts to configure security groups
+- Update install scripts to remove virtual interface configurations
+
* Wed Apr 4 2013 Gary Kotton <gkotton at redhat.com> - 2013.1-1
- Update to grizzly release
diff --git a/quantum-node-setup b/quantum-node-setup
index 6e2df5a..4ecf896 100755
--- a/quantum-node-setup
+++ b/quantum-node-setup
@@ -115,7 +115,6 @@ openstack-config --set ${Q_CONF} DEFAULT qpid_hostname ${Q_HOST}
case "${QUANTUM_PLUGIN}" in
"linuxbridge")
- LIBVIRT_VIF_DRIVER=nova.virt.libvirt.vif.QuantumLinuxBridgeVIFDriver
;;
"openvswitch")
@@ -124,6 +123,8 @@ case "${QUANTUM_PLUGIN}" in
echo "Please install openvswitch"
exit 0
fi
+ OVS_CONF=/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
+ openstack-config --set ${OVS_CONF} SECURITYGROUP firewall_driver quantum.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
;;
esac
@@ -155,7 +156,8 @@ if ! [ -e "${NOVA_CONF}" ]; then
echo " quantum_auth_strategy=keystone"
echo " quantum_admin_tenant_name=${OS_TENANT_NAME}"
echo " quantum_url=http://${Q_HOST}:${Q_PORT}/"
- echo " libvirt_vif_driver=${LIBVIRT_VIF_DRIVER}"
+ echo " firewall_driver=nova.virt.firewall.NoopFirewallDriver"
+ echo " security_group_api=quantum"
else
openstack-config --set ${NOVA_CONF} DEFAULT network_api_class nova.network.quantumv2.api.API
openstack-config --set ${NOVA_CONF} DEFAULT quantum_admin_username ${OS_USERNAME}
@@ -164,7 +166,8 @@ else
openstack-config --set ${NOVA_CONF} DEFAULT quantum_auth_strategy keystone
openstack-config --set ${NOVA_CONF} DEFAULT quantum_admin_tenant_name ${OS_TENANT_NAME}
openstack-config --set ${NOVA_CONF} DEFAULT quantum_url http://${Q_HOST}:${Q_PORT}/
- openstack-config --set ${NOVA_CONF} DEFAULT libvirt_vif_driver ${LIBVIRT_VIF_DRIVER}
+ openstack-config --set ${NOVA_CONF} DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver
+ openstack-config --set ${NOVA_CONF} DEFAULT security_group_api quantum
fi
echo "Configuration updates complete!"
diff --git a/quantum-server-setup b/quantum-server-setup
index 59a3ebe..065dc48 100755
--- a/quantum-server-setup
+++ b/quantum-server-setup
@@ -99,8 +99,6 @@ OS_TENANT_NAME=${OS_TENANT_NAME:-service}
# Nova specific
NOVA_CONF=/etc/nova/nova.conf
SCHEDULER_DRIVER=""
-LIBVIRT_VIF_DRIVER=""
-LIBVIRT_VIF_TYPE=""
while [ $# -gt 0 ]
do
@@ -326,7 +324,6 @@ case "${QUANTUM_PLUGIN}" in
read NETWORK_DEVICE
openstack-config --set ${LB_CONF} LINUX_BRIDGE physical_interface ${NETWORK_DEVICE}
- LIBVIRT_VIF_DRIVER=nova.virt.libvirt.vif.QuantumLinuxBridgeVIFDriver
ln -s ${LB_CONF} /etc/quantum/plugin.ini
;;
@@ -334,7 +331,7 @@ case "${QUANTUM_PLUGIN}" in
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'"
openstack-config --set ${OVS_CONF} DATABASE sql_connection mysql://${QUANTUM_USER}:${MYSQL_Q_PW}@`hostname`/ovs_quantum
- LIBVIRT_VIF_DRIVER=nova.virt.libvirt.vif.LibvirtHybridOVSBridgeDriver
+ openstack-config --set ${OVS_CONF} SECURITYGROUP firewall_driver quantum.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
ln -s ${OVS_CONF} /etc/quantum/plugin.ini
;;
esac
@@ -362,7 +359,8 @@ if ! [ -e "${NOVA_CONF}" ]; then
echo " quantum_auth_strategy=keystone"
echo " quantum_admin_tenant_name=${OS_TENANT_NAME}"
echo " quantum_url=http://${Q_HOST}:${Q_PORT}/"
- echo " libvirt_vif_driver=${LIBVIRT_VIF_DRIVER}"
+ echo " firewall_driver=nova.virt.firewall.NoopFirewallDriver"
+ echo " security_group_api=quantum"
else
openstack-config --set ${NOVA_CONF} DEFAULT network_api_class nova.network.quantumv2.api.API
openstack-config --set ${NOVA_CONF} DEFAULT quantum_admin_username ${OS_USERNAME}
@@ -371,7 +369,8 @@ else
openstack-config --set ${NOVA_CONF} DEFAULT quantum_auth_strategy keystone
openstack-config --set ${NOVA_CONF} DEFAULT quantum_admin_tenant_name ${OS_TENANT_NAME}
openstack-config --set ${NOVA_CONF} DEFAULT quantum_url http://${Q_HOST}:${Q_PORT}/
- openstack-config --set ${NOVA_CONF} DEFAULT libvirt_vif_driver ${LIBVIRT_VIF_DRIVER}
+ openstack-config --set ${NOVA_CONF} DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver
+ openstack-config --set ${NOVA_CONF} DEFAULT security_group_api quantum
fi
echo "Configuration updates complete!"
diff --git a/sources b/sources
index 93b2eb7..7ddbbd6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1ad2338b25cfde582de479678533113e quantum-2013.1.tar.gz
+06ba502f288e30519f2f13c7b189bfb8 quantum-2013.1.1.tar.gz
More information about the scm-commits
mailing list