[openstack-quantum] Update to essex milestone 4
Robert A. Kukura
rkukura at fedoraproject.org
Mon Mar 5 16:37:40 UTC 2012
commit 35055e828bca10704f88c3b41a977a93fd0a1227
Author: Bob Kukura <rkukura at redhat.com>
Date: Mon Mar 5 11:36:03 2012 -0500
Update to essex milestone 4
- Move plugins to sub-packages
- Systemd units for agents
.gitignore | 2 +-
openstack-quantum.spec | 254 +++++++++++++++++---
quantum-linuxbridge-agent.service | 12 +
quantum-openvswitch-agent.service | 12 +
quantum-ryu-agent.service | 12 +
...stack-quantum.service => quantum-server.service | 0
sources | 2 +-
7 files changed, 264 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0a2f51d..a6288b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/quantum-2012.1~e3.tar.gz
+/quantum-2012.1~e4.tar.gz
diff --git a/openstack-quantum.spec b/openstack-quantum.spec
index 191fefb..b22f796 100644
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@ -1,28 +1,31 @@
#
-# This is 2012.1 essex-3 milestone
+# This is 2012.1 essex-4 milestone
#
%global release_name essex
%global release_letter e
-%global milestone 3
+%global milestone 4
Name: openstack-quantum
Version: 2012.1
-Release: 0.1.%{release_letter}%{milestone}%{?dist}
+Release: 0.2.%{release_letter}%{milestone}%{?dist}
Summary: Virtual network service for OpenStack (quantum)
Group: Applications/System
License: ASL 2.0
URL: http://launchpad.net/quantum/
Source0: http://launchpad.net/quantum/%{release_name}/%{release_name}-%{milestone}/+download/quantum-%{version}~%{release_letter}%{milestone}.tar.gz
-Source1: openstack-quantum.service
-Source2: quantum.logrotate
+Source1: quantum.logrotate
+Source2: quantum-server.service
+Source3: quantum-linuxbridge-agent.service
+Source4: quantum-openvswitch-agent.service
+Source5: quantum-ryu-agent.service
BuildArch: noarch
BuildRequires: python2-devel
BuildRequires: python-setuptools
BuildRequires: systemd-units
-#BuildRequires: dos2unix
+BuildRequires: dos2unix
Requires: python-quantum = %{version}-%{release}
@@ -47,10 +50,11 @@ etc.)
Summary: Quantum Python libraries
Group: Applications/System
-Requires: python-quantumclient
+Requires: python-quantumclient >= %{version}
Requires: MySQL-python
Requires: python-configobj
Requires: python-eventlet
+Requires: python-lxml
Requires: python-gflags
Requires: python-anyjson
Requires: python-nose
@@ -68,16 +72,92 @@ networks.
This package contains the quantum Python library.
+%package -n openstack-quantum-cisco
+Summary: Quantum Cisco plugin
+Group: Applications/System
+
+Requires: openstack-quantum = %{version}-%{release}
+
+
+%description -n openstack-quantum-cisco
+Quantum provides an API to dynamically request and configure virtual
+networks.
+
+This package contains the quantum plugin that implements virtual
+networks using Cisco UCS and Nexus.
+
+
+%package -n openstack-quantum-linuxbridge
+Summary: Quantum linuxbridge plugin
+Group: Applications/System
+
+Requires: openstack-quantum = %{version}-%{release}
+Requires: bridge-utils
+
+
+%description -n openstack-quantum-linuxbridge
+Quantum provides an API to dynamically request and configure virtual
+networks.
+
+This package contains the quantum plugin that implements virtual
+networks as VLANs using Linux bridging.
+
+
+%package -n openstack-quantum-nicira
+Summary: Quantum Nicira plugin
+Group: Applications/System
+
+Requires: openstack-quantum = %{version}-%{release}
+
+
+%description -n openstack-quantum-nicira
+Quantum provides an API to dynamically request and configure virtual
+networks.
+
+This package contains the quantum plugin that implements virtual
+networks using Nicira NVP.
+
+
+%package -n openstack-quantum-openvswitch
+Summary: Quantum openvswitch plugin
+Group: Applications/System
+
+Requires: openstack-quantum = %{version}-%{release}
+#Requires: openvswitch
+
+
+%description -n openstack-quantum-openvswitch
+Quantum provides an API to dynamically request and configure virtual
+networks.
+
+This package contains the quantum plugin that implements virtual
+networks using Open vSwitch.
+
+
+%package -n openstack-quantum-ryu
+Summary: Quantum ryu plugin
+Group: Applications/System
+
+Requires: openstack-quantum = %{version}-%{release}
+
+
+%description -n openstack-quantum-ryu
+Quantum provides an API to dynamically request and configure virtual
+networks.
+
+This package contains the quantum plugin that implements virtual
+networks using the Ryu Network Operating System.
+
+
%prep
%setup -q -n quantum-%{version}
find quantum -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
-#mv quantum/plugins/cisco/README README-cisco
-#chmod 644 README-cisco
-#dos2unix README-cisco
-#mv quantum/plugins/openvswitch/README README-openvswitch
+chmod 644 quantum/plugins/cisco/README
+dos2unix quantum/plugins/cisco/README
+sed -i '/pep8>=/d' setup.py
%build
%{__python} setup.py build
@@ -90,7 +170,6 @@ find quantum -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
rm -rf %{buildroot}%{python_sitelib}/bin
rm -rf %{buildroot}%{python_sitelib}/doc
rm -rf %{buildroot}%{python_sitelib}/tools
-rm %{buildroot}%{_bindir}/quantum
rm %{buildroot}/usr/etc/quantum/quantum.conf.test
rm %{buildroot}/usr/etc/init.d/quantum-server
@@ -101,11 +180,14 @@ install -p -D -m 755 bin/quantum-server %{buildroot}%{_bindir}/quantum-server
install -d -m 755 %{buildroot}%{_sysconfdir}/quantum
mv %{buildroot}/usr/etc/quantum/* %{buildroot}%{_sysconfdir}/quantum
-# Install systemd units
-install -p -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/openstack-quantum.service
-
# Install logrotate
-install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-quantum
+install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-quantum
+
+# Install systemd units
+install -p -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/quantum-server.service
+install -p -D -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/quantum-linuxbridge-agent.service
+install -p -D -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/quantum-openvswitch-agent.service
+install -p -D -m 644 %{SOURCE5} %{buildroot}%{_unitdir}/quantum-ryu-agent.service
# Setup directories
install -d -m 755 %{buildroot}%{_sharedstatedir}/quantum
@@ -130,8 +212,8 @@ fi
%preun
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
- /bin/systemctl --no-reload disable openstack-quantum.service > /dev/null 2>&1 || :
- /bin/systemctl stop openstack-quantum.service > /dev/null 2>&1 || :
+ /bin/systemctl --no-reload disable quantum-server.service > /dev/null 2>&1 || :
+ /bin/systemctl stop quantum-server.service > /dev/null 2>&1 || :
fi
@@ -139,25 +221,67 @@ fi
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
- /bin/systemctl try-restart openstack-quantum.service >/dev/null 2>&1 || :
+ /bin/systemctl try-restart quantum-server.service >/dev/null 2>&1 || :
+fi
+
+
+%preun -n openstack-quantum-linuxbridge
+if [ $1 -eq 0 ] ; then
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable quantum-linuxbridge-agent.service > /dev/null 2>&1 || :
+ /bin/systemctl stop quantum-linuxbridge-agent.service > /dev/null 2>&1 || :
+fi
+
+
+%postun -n openstack-quantum-linuxbridge
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+ # Package upgrade, not uninstall
+ /bin/systemctl try-restart quantum-linuxbridge-agent.service >/dev/null 2>&1 || :
+fi
+
+
+%preun -n openstack-quantum-openvswitch
+if [ $1 -eq 0 ] ; then
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable quantum-openvswitch-agent.service > /dev/null 2>&1 || :
+ /bin/systemctl stop quantum-openvswitch-agent.service > /dev/null 2>&1 || :
+fi
+
+
+%postun -n openstack-quantum-openvswitch
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+ # Package upgrade, not uninstall
+ /bin/systemctl try-restart quantum-openvswitch-agent.service >/dev/null 2>&1 || :
+fi
+
+
+%preun -n openstack-quantum-ryu
+if [ $1 -eq 0 ] ; then
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable quantum-ryu-agent.service > /dev/null 2>&1 || :
+ /bin/systemctl stop quantum-ryu-agent.service > /dev/null 2>&1 || :
+fi
+
+
+%postun -n openstack-quantum-ryu
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+ # Package upgrade, not uninstall
+ /bin/systemctl try-restart quantum-ryu-agent.service >/dev/null 2>&1 || :
fi
%files
-#%%doc LICENSE
+%doc LICENSE
%doc README
-#%%doc README-cisco
-#%%doc README-openvswitch
%{_bindir}/quantum-server
-%{_unitdir}/openstack-quantum.service
+%{_unitdir}/quantum-server.service
%dir %{_sysconfdir}/quantum
%config(noreplace) %{_sysconfdir}/quantum/quantum.conf
%config(noreplace) %{_sysconfdir}/quantum/plugins.ini
%dir %{_sysconfdir}/quantum/plugins
-%dir %{_sysconfdir}/quantum/plugins/cisco
-%config(noreplace) %{_sysconfdir}/quantum/plugins/cisco/*.ini
-%dir %{_sysconfdir}/quantum/plugins/openvswitch
-%config(noreplace) %{_sysconfdir}/quantum/plugins/openvswitch/*.ini
%config(noreplace) %{_sysconfdir}/logrotate.d/*
%dir %attr(0755, quantum, quantum) %{_sharedstatedir}/quantum
%dir %attr(0755, quantum, quantum) %{_localstatedir}/log/quantum
@@ -165,14 +289,88 @@ fi
%files -n python-quantum
# note that %%{python_sitelib}/quantum is owned by python-quantumclient
-#%%doc LICENSE
+%doc LICENSE
%doc README
%{python_sitelib}/quantum/*
%exclude %{python_sitelib}/quantum/__init__.*
+%exclude %{python_sitelib}/quantum/extensions/_credential_view.py*
+%exclude %{python_sitelib}/quantum/extensions/portprofile.py*
+%exclude %{python_sitelib}/quantum/extensions/novatenant.py*
+%exclude %{python_sitelib}/quantum/extensions/credential.py*
+%exclude %{python_sitelib}/quantum/extensions/_novatenant_view.py*
+%exclude %{python_sitelib}/quantum/extensions/multiport.py*
+%exclude %{python_sitelib}/quantum/extensions/_pprofiles.py*
+%exclude %{python_sitelib}/quantum/extensions/qos.py*
+%exclude %{python_sitelib}/quantum/extensions/_qos_view.py*
+%exclude %{python_sitelib}/quantum/plugins/cisco
+%exclude %{python_sitelib}/quantum/plugins/linuxbridge
+%exclude %{python_sitelib}/quantum/plugins/nicira
+%exclude %{python_sitelib}/quantum/plugins/openvswitch
+%exclude %{python_sitelib}/quantum/plugins/ryu
%{python_sitelib}/quantum-%%{version}-*.egg-info
+%files -n openstack-quantum-cisco
+%doc LICENSE
+%doc quantum/plugins/cisco/README
+%{python_sitelib}/quantum/extensions/_credential_view.py*
+%{python_sitelib}/quantum/extensions/portprofile.py*
+%{python_sitelib}/quantum/extensions/novatenant.py*
+%{python_sitelib}/quantum/extensions/credential.py*
+%{python_sitelib}/quantum/extensions/_novatenant_view.py*
+%{python_sitelib}/quantum/extensions/multiport.py*
+%{python_sitelib}/quantum/extensions/_pprofiles.py*
+%{python_sitelib}/quantum/extensions/qos.py*
+%{python_sitelib}/quantum/extensions/_qos_view.py*
+%{python_sitelib}/quantum/plugins/cisco
+%dir %{_sysconfdir}/quantum/plugins/cisco
+%config(noreplace) %{_sysconfdir}/quantum/plugins/cisco/*.ini
+
+
+%files -n openstack-quantum-linuxbridge
+%doc LICENSE
+%doc quantum/plugins/linuxbridge/README
+%{_bindir}/quantum-linuxbridge-agent
+%{_unitdir}/quantum-linuxbridge-agent.service
+%{python_sitelib}/quantum/plugins/linuxbridge
+%dir %{_sysconfdir}/quantum/plugins/linuxbridge
+%config(noreplace) %{_sysconfdir}/quantum/plugins/linuxbridge/*.ini
+
+
+%files -n openstack-quantum-nicira
+%doc LICENSE
+%doc quantum/plugins/nicira/nicira_nvp_plugin/README
+%{python_sitelib}/quantum/plugins/nicira
+%dir %{_sysconfdir}/quantum/plugins/nicira
+%config(noreplace) %{_sysconfdir}/quantum/plugins/nicira/*.ini
+
+
+%files -n openstack-quantum-openvswitch
+%doc LICENSE
+%doc quantum/plugins/openvswitch/README
+%{_bindir}/quantum-openvswitch-agent
+%{_unitdir}/quantum-openvswitch-agent.service
+%{python_sitelib}/quantum/plugins/openvswitch
+%dir %{_sysconfdir}/quantum/plugins/openvswitch
+%config(noreplace) %{_sysconfdir}/quantum/plugins/openvswitch/*.ini
+
+
+%files -n openstack-quantum-ryu
+%doc LICENSE
+%doc quantum/plugins/ryu/README
+%{_bindir}/quantum-ryu-agent
+%{_unitdir}/quantum-ryu-agent.service
+%{python_sitelib}/quantum/plugins/ryu
+%dir %{_sysconfdir}/quantum/plugins/ryu
+%config(noreplace) %{_sysconfdir}/quantum/plugins/ryu/*.ini
+
+
%changelog
+* Mon Mar 5 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-0.2.e4
+- Update to essex milestone 4
+- Move plugins to sub-packages
+- Systemd units for agents
+
* Mon Jan 31 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-0.1.e3
- Update to essex milestone 3 for F17
diff --git a/quantum-linuxbridge-agent.service b/quantum-linuxbridge-agent.service
new file mode 100644
index 0000000..0dcab18
--- /dev/null
+++ b/quantum-linuxbridge-agent.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=OpenStack Quantum Linux Bridge Agent
+After=syslog.target network.target
+
+[Service]
+Type=simple
+#User=quantum
+User=root
+ExecStart=/usr/bin/quantum-linuxbridge-agent /etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini
+
+[Install]
+WantedBy=multi-user.target
diff --git a/quantum-openvswitch-agent.service b/quantum-openvswitch-agent.service
new file mode 100644
index 0000000..d53438c
--- /dev/null
+++ b/quantum-openvswitch-agent.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=OpenStack Quantum Open vSwitch Agent
+After=syslog.target network.target
+
+[Service]
+Type=simple
+#User=quantum
+User=root
+ExecStart=/usr/bin/quantum-openvswitch-agent /etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
+
+[Install]
+WantedBy=multi-user.target
diff --git a/quantum-ryu-agent.service b/quantum-ryu-agent.service
new file mode 100644
index 0000000..b912cd2
--- /dev/null
+++ b/quantum-ryu-agent.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=OpenStack Quantum Ryu Network Operating System Agent
+After=syslog.target network.target
+
+[Service]
+Type=simple
+#User=quantum
+User=root
+ExecStart=/usr/bin/quantum-ryu-agent /etc/quantum/plugins/ryu/ryu.ini
+
+[Install]
+WantedBy=multi-user.target
diff --git a/openstack-quantum.service b/quantum-server.service
similarity index 100%
rename from openstack-quantum.service
rename to quantum-server.service
diff --git a/sources b/sources
index 0536c86..bdfd564 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-32316cc66122901b9527042e8bab8222 quantum-2012.1~e3.tar.gz
+9b12b774dd5ab6e71f8fadd8dd1a716d quantum-2012.1~e4.tar.gz
More information about the scm-commits
mailing list