[openstack-quantum] Update to folsom rc1
Robert A. Kukura
rkukura at fedoraproject.org
Wed Sep 12 15:40:56 UTC 2012
commit 553a7e7f48c4af6f9f29187b3644b2043cb535f6
Author: Bob Kukura <rkukura at redhat.com>
Date: Wed Sep 12 11:39:29 2012 -0400
Update to folsom rc1
- Fix command lines in agent systemd units
- Fix setup scripts
- Fix configuration of agents to use quantum-rootwrap
- Set "debug = False" and "auth_strategy = noauth" in quantum.conf
- Symlink /etc/quantum/plugin.ini to plugin's config file
- Add "--config-file /etc/quantum/plugin.ini" to ExecStart in quantum-server.service
.gitignore | 2 +-
openstack-quantum.spec | 21 +++++++++++++++++----
quantum-dhcp-agent.service | 2 +-
quantum-l3-agent.service | 2 +-
quantum-linuxbridge-agent.service | 2 +-
quantum-nec-agent.service | 2 +-
quantum-node-setup | 2 --
quantum-openvswitch-agent.service | 2 +-
quantum-ryu-agent.service | 2 +-
quantum-server-setup | 12 +++++-------
quantum-server.service | 2 +-
sources | 2 +-
12 files changed, 31 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1263187..a419369 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/quantum-2012.2~rc1~20120911.1224.tar.gz
+/quantum-2012.2~rc1.tar.gz
diff --git a/openstack-quantum.spec b/openstack-quantum.spec
index 305ff2d..0321049 100644
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@ -1,17 +1,17 @@
#
-# This is 2012.2 folsom pre-rc1 snapshot
+# This is 2012.2 folsom rc1
#
Name: openstack-quantum
Version: 2012.2
-Release: 0.4.rc1.20120911.1224%{?dist}
+Release: 0.5.rc1%{?dist}
Summary: Virtual network service for OpenStack (quantum)
Group: Applications/System
License: ASL 2.0
URL: http://launchpad.net/quantum/
-Source0: http://tarballs.openstack.org/quantum/quantum-2012.2~rc1~20120911.1224.tar.gz
+Source0: https://launchpad.net/quantum/folsom/folsom-rc1/+download/quantum-2012.2~rc1.tar.gz
Source1: quantum.logrotate
Source2: quantum-sudoers
Source4: quantum-server-setup
@@ -202,6 +202,10 @@ find quantum/debug -name \*.py -exec sed -i '/\/bin\/python/d' {} \;
chmod 644 quantum/plugins/cisco/README
+# Adjust configuration file content
+sed -i 's/debug = True/debug = False/' etc/quantum.conf
+sed -i 's/\# auth_strategy = keystone/auth_strategy = noauth/' etc/quantum.conf
+
# Remove unneeded dependency
sed -i '/setuptools_git/d' setup.py
@@ -252,7 +256,7 @@ install -p -D -m 640 etc/l3_agent.ini %{buildroot}%{_sysconfdir}/quantum/l3_agen
# Configure agents to use quantum-rootwrap
for f in %{buildroot}%{_sysconfdir}/quantum/plugins/*/*.ini %{buildroot}%{_sysconfdir}/quantum/*_agent.ini; do
- sed -i 's/root_helper = sudo/root_helper = sudo quantum-rootwrap/g' $f
+ sed -i 's/^root_helper.*/root_helper = sudo quantum-rootwrap \/etc\/quantum\/rootwrap.conf/g' $f
done
# Install logrotate
@@ -517,6 +521,15 @@ fi
%changelog
+* Wed Sep 12 2012 Robert Kukura <rkukura at redhat.com> - 2012.2-0.5.rc1
+- Update to folsom rc1
+- Fix command lines in agent systemd units
+- Fix setup scripts
+- Fix configuration of agents to use quantum-rootwrap
+- Set "debug = False" and "auth_strategy = noauth" in quantum.conf
+- Symlink /etc/quantum/plugin.ini to plugin's config file
+- Add "--config-file /etc/quantum/plugin.ini" to ExecStart in quantum-server.service
+
* Tue Sep 11 2012 Robert Kukura <rkukura at redhat.com> - 2012.2-0.4.rc1.20120911.1224
- Update to folsom rc1 snapshot
- Add support for new agents, plugins and rootwrap
diff --git a/quantum-dhcp-agent.service b/quantum-dhcp-agent.service
index 1b98fcf..4f12698 100644
--- a/quantum-dhcp-agent.service
+++ b/quantum-dhcp-agent.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=quantum
-ExecStart=/usr/bin/quantum-dhcp-agent /etc/quantum/dhcp_agent.ini
+ExecStart=/usr/bin/quantum-dhcp-agent --config-file /etc/quantum/quantum.conf --config-file /etc/quantum/dhcp_agent.ini --log-file /var/log/quantum/dhcp_agent.log
PrivateTmp=true
[Install]
diff --git a/quantum-l3-agent.service b/quantum-l3-agent.service
index b4e4cd0..5031422 100644
--- a/quantum-l3-agent.service
+++ b/quantum-l3-agent.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=quantum
-ExecStart=/usr/bin/quantum-l3-agent /etc/quantum/l3_agent.ini
+ExecStart=/usr/bin/quantum-l3-agent --config-file /etc/quantum/quantum.conf --config-file /etc/quantum/l3_agent.ini --log-file /var/log/quantum/l3_agent.log
PrivateTmp=true
[Install]
diff --git a/quantum-linuxbridge-agent.service b/quantum-linuxbridge-agent.service
index 4e019a1..8f5bfa3 100644
--- a/quantum-linuxbridge-agent.service
+++ b/quantum-linuxbridge-agent.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=quantum
-ExecStart=/usr/bin/quantum-linuxbridge-agent /etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini
+ExecStart=/usr/bin/quantum-linuxbridge-agent --config-file /etc/quantum/quantum.conf --config-file /etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini --log-file /var/log/quantum/linuxbridge.log
PrivateTmp=true
[Install]
diff --git a/quantum-nec-agent.service b/quantum-nec-agent.service
index 735db4f..d5d557a 100644
--- a/quantum-nec-agent.service
+++ b/quantum-nec-agent.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=quantum
-ExecStart=/usr/bin/quantum-nec-agent /etc/quantum/plugins/nec/nec.ini
+ExecStart=/usr/bin/quantum-nec-agent --config-file /etc/quantum/quantum.conf --config-file /etc/quantum/plugins/nec/nec.ini --log-file /var/log/quantum/nec.log
PrivateTmp=true
[Install]
diff --git a/quantum-node-setup b/quantum-node-setup
index 620aead..6b587c8 100755
--- a/quantum-node-setup
+++ b/quantum-node-setup
@@ -158,7 +158,6 @@ 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_type=ethernet"
echo " libvirt_vif_driver=${LIBVIRT_VIF_DRIVER}"
else
openstack-config --set ${NOVA_CONF} DEFAULT network_api_class nova.network.quantumv2.api.API
@@ -168,7 +167,6 @@ 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_type ethernet
openstack-config --set ${NOVA_CONF} DEFAULT libvirt_vif_driver ${LIBVIRT_VIF_DRIVER}
fi
diff --git a/quantum-openvswitch-agent.service b/quantum-openvswitch-agent.service
index 8d3ebd4..0bbc995 100644
--- a/quantum-openvswitch-agent.service
+++ b/quantum-openvswitch-agent.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=quantum
-ExecStart=/usr/bin/quantum-openvswitch-agent /etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
+ExecStart=/usr/bin/quantum-openvswitch-agent --config-file /etc/quantum/quantum.conf --config-file /etc/quantum/plugins/linuxbridge/ovs_quantum_plugin.ini --log-file /var/log/quantum/ovs_quantum.log
PrivateTmp=true
[Install]
diff --git a/quantum-ryu-agent.service b/quantum-ryu-agent.service
index 946bd82..d44266c 100644
--- a/quantum-ryu-agent.service
+++ b/quantum-ryu-agent.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=quantum
-ExecStart=/usr/bin/quantum-ryu-agent /etc/quantum/plugins/ryu/ryu.ini
+ExecStart=/usr/bin/quantum-ryu-agent --config-file /etc/quantum/quantum.conf --config-file /etc/quantum/plugins/ryu/ryu.ini --log-file /var/log/quantum/ryu.log
PrivateTmp=true
[Install]
diff --git a/quantum-server-setup b/quantum-server-setup
index ceff08c..a3d23f2 100755
--- a/quantum-server-setup
+++ b/quantum-server-setup
@@ -166,7 +166,7 @@ fi
case "${QUANTUM_PLUGIN}" in
"linuxbridge")
DB_NAME="quantum_linux_bridge"
- Q_PLUGIN_CLASS="quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2"
+ Q_PLUGIN_CLASS="quantum.plugins.linuxbridge.lb_quantum_plugin.LinuxBridgePluginV2"
;;
"openvswitch")
@@ -176,7 +176,7 @@ case "${QUANTUM_PLUGIN}" in
exit 0
fi
DB_NAME="ovs_quantum"
- Q_PLUGIN_CLASS="quantum.plugins.linuxbridge.lb_quantum_plugin.LinuxBridgePluginV2"
+ Q_PLUGIN_CLASS="quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2"
;;
esac
@@ -319,6 +319,7 @@ case "${QUANTUM_PLUGIN}" in
LIBVIRT_VIF_DRIVER=nova.virt.libvirt.vif.QuantumLinuxBridgeVIFDriver
LINUX_INTERFACE_DRIVER=nova.network.linux_net.QuantumLinuxBridgeInterfaceDriver
+ ln -s ${LB_CONF} /etc/quantum/plugin.ini
;;
"openvswitch")
@@ -327,6 +328,7 @@ case "${QUANTUM_PLUGIN}" in
openstack-config --set ${OVS_CONF} DATABASE sql_connection mysql://${QUANTUM_USER}:${MYSQL_Q_PW}@`hostname`/ovs_quantum
LIBVIRT_VIF_DRIVER=nova.virt.libvirt.vif.LibvirtOpenVswitchDriver
LINUX_INTERFACE_DRIVER=nova.network.linux_net.LinuxOVSInterfaceDriver
+ ln -s ${OVS_CONF} /etc/quantum/plugin.ini
;;
esac
@@ -351,9 +353,7 @@ 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_type ethernet"
- echo " libvirt_vif_driver ${LIBVIRT_VIF_DRIVER}"
- echo " libvirt_vif_type ${LIBVIRT_VIF_TYPE}"
+ echo " libvirt_vif_driver=${LIBVIRT_VIF_DRIVER}"
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}
@@ -362,9 +362,7 @@ 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_type ethernet
openstack-config --set ${NOVA_CONF} DEFAULT libvirt_vif_driver ${LIBVIRT_VIF_DRIVER}
- openstack-config --set ${NOVA_CONF} DEFAULT libvirt_vif_type ${LIBVIRT_VIF_TYPE}
fi
echo "Configuration updates complete!"
diff --git a/quantum-server.service b/quantum-server.service
index 43fcba3..d898825 100644
--- a/quantum-server.service
+++ b/quantum-server.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=quantum
-ExecStart=/usr/bin/quantum-server --config-file /etc/quantum/quantum.conf --log-file /var/log/quantum/server.log
+ExecStart=/usr/bin/quantum-server --config-file /etc/quantum/quantum.conf --config-file /etc/quantum/plugin.ini --log-file /var/log/quantum/server.log
PrivateTmp=true
[Install]
diff --git a/sources b/sources
index 8475089..2493b9e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8cd5cb28456cd9c5362edff0254e198e quantum-2012.2~rc1~20120911.1224.tar.gz
+688de10bf2c2e49ea661f2b2b8e8d7cc quantum-2012.2~rc1.tar.gz
More information about the scm-commits
mailing list