[openstack-quantum/el6-grizzly: 6/7] Merge branch 'master' into el6-grizzly
Terry Wilson
otherwiseguy at fedoraproject.org
Thu Feb 28 16:14:31 UTC 2013
commit 51af4ee8a04f9ada3355fdd80aa76f3bff1222c7
Merge: 998ce22 c0f2e73
Author: Terry Wilson <twilson at redhat.com>
Date: Wed Feb 27 12:12:44 2013 -0600
Merge branch 'master' into el6-grizzly
Conflicts:
openstack-quantum.spec
.gitignore | 2 +-
0001-Add-midonet-to-setup.py.patch | 33 +++
openstack-quantum.spec | 245 ++++++++++++++++++--
quantum-metadata-agent.service | 12 +
quantum-ovs-cleanup.service | 13 +
...-8017d0932c54078e7e18058e78f12c76d68462c7.patch | 37 ---
sources | 2 +-
7 files changed, 281 insertions(+), 63 deletions(-)
---
diff --cc openstack-quantum.spec
index 4d431af,bea2f9f..ea811d1
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@@ -19,30 -23,21 +23,33 @@@ Source5: quantum-node-setu
Source6: quantum-dhcp-setup
Source7: quantum-l3-setup
-Source10: quantum-server.service
-Source11: quantum-linuxbridge-agent.service
-Source12: quantum-openvswitch-agent.service
-Source13: quantum-ryu-agent.service
-Source14: quantum-nec-agent.service
-Source15: quantum-dhcp-agent.service
-Source16: quantum-l3-agent.service
-Source17: quantum-metadata-agent.service
-Source18: quantum-ovs-cleanup.service
+Source10: quantum-server.init
+Source20: quantum-server.upstart
+Source11: quantum-linuxbridge-agent.init
+Source21: quantum-linuxbridge-agent.upstart
+Source12: quantum-openvswitch-agent.init
+Source22: quantum-openvswitch-agent.upstart
+Source13: quantum-ryu-agent.init
+Source23: quantum-ryu-agent.upstart
+Source14: quantum-nec-agent.init
+Source24: quantum-nec-agent.upstart
+Source15: quantum-dhcp-agent.init
+Source25: quantum-dhcp-agent.upstart
+Source16: quantum-l3-agent.init
+Source26: quantum-l3-agent.upstart
++Source17: quantum-metadata-agent.init
++Source27: quantum-metadata-agent.upstart
++Source18: quantum-ovs-cleanup.init
++Source28: quantum-ovs-cleanup.upstart
+
+# This is EPEL specific and not upstream
+Patch100: openstack-quantum-newdeps.patch
#
- # patches_base=2012.2.1
+ # patches_base=2013.1.g3
#
+ Patch0001: 0001-Add-midonet-to-setup.py.patch
- # Upstream stable branch patch https://review.openstack.org/17236
- Patch1: quantum.git-8017d0932c54078e7e18058e78f12c76d68462c7.patch
BuildArch: noarch
@@@ -59,14 -47,16 +66,18 @@@ BuildRequires: dos2uni
Requires: python-quantum = %{version}-%{release}
Requires: openstack-utils
+Requires: python-keystone
+
+Requires(post): chkconfig
+Requires(postun): initscripts
+Requires(preun): chkconfig
+Requires(preun): initscripts
+Requires(pre): shadow-utils
+ # dnsmasq is not a hard requirement, but is currently the only option
+ # when quantum-dhcp-agent is deployed.
+ Requires: dnsmasq
+
-Requires(pre): shadow-utils
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-
%description
Quantum is a virtual network service for Openstack. Just like
@@@ -90,16 -81,18 +102,17 @@@ Requires: python-greenle
Requires: python-httplib2
Requires: python-iso8601
Requires: python-kombu
+Requires: python-lxml
+Requires: python-paste-deploy1.5
+Requires: python-routes1.12
+Requires: python-sqlalchemy0.7
+Requires: python-webob1.0
Requires: python-netaddr
+ Requires: python-oslo-config
-Requires: python-paste-deploy
Requires: python-qpid
-Requires: python-quantumclient >= 1:2.1.10
-Requires: python-routes
-Requires: python-sqlalchemy < 0.8.0
-Requires: python-webob
+Requires: python-quantumclient >= 1:2.1.1
Requires: sudo
-
-
%description -n python-quantum
Quantum provides an API to dynamically request and configure virtual
networks.
@@@ -217,14 -286,20 +306,23 @@@ networks using multiple other quantum p
%prep
- %setup -q -n quantum-%{version}
+ %setup -q -n quantum-%{version}.%{release_letter}%{milestone}
+
+ %patch0001 -p1
- %patch1 -p1
+# Apply EPEL patch
+%patch100 -p1
+
+ sed -i 's/%{version}.%{release_letter}%{milestone}/%{version}/' PKG-INFO
+
find quantum -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
+ # Remove bundled egg-info
+ rm -rf quantum.egg-info
+
+ # let RPM handle deps
+ sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
+
chmod 644 quantum/plugins/cisco/README
# Adjust configuration file content
@@@ -287,20 -365,20 +388,22 @@@ install -p -D -m 644 %{SOURCE1} %{build
# Install sudoers
install -p -D -m 440 %{SOURCE2} %{buildroot}%{_sysconfdir}/sudoers.d/quantum
-# Install systemd units
-install -p -D -m 644 %{SOURCE10} %{buildroot}%{_unitdir}/quantum-server.service
-install -p -D -m 644 %{SOURCE11} %{buildroot}%{_unitdir}/quantum-linuxbridge-agent.service
-install -p -D -m 644 %{SOURCE12} %{buildroot}%{_unitdir}/quantum-openvswitch-agent.service
-install -p -D -m 644 %{SOURCE13} %{buildroot}%{_unitdir}/quantum-ryu-agent.service
-install -p -D -m 644 %{SOURCE14} %{buildroot}%{_unitdir}/quantum-nec-agent.service
-install -p -D -m 644 %{SOURCE15} %{buildroot}%{_unitdir}/quantum-dhcp-agent.service
-install -p -D -m 644 %{SOURCE16} %{buildroot}%{_unitdir}/quantum-l3-agent.service
-install -p -D -m 644 %{SOURCE17} %{buildroot}%{_unitdir}/quantum-metadata-agent.service
-install -p -D -m 644 %{SOURCE18} %{buildroot}%{_unitdir}/quantum-ovs-cleanup.service
+# Install sysv init scripts
+install -p -D -m 755 %{SOURCE10} %{buildroot}%{_initrddir}/quantum-server
+install -p -D -m 755 %{SOURCE11} %{buildroot}%{_initrddir}/quantum-linuxbridge-agent
+install -p -D -m 755 %{SOURCE12} %{buildroot}%{_initrddir}/quantum-openvswitch-agent
+install -p -D -m 755 %{SOURCE13} %{buildroot}%{_initrddir}/quantum-ryu-agent
+install -p -D -m 755 %{SOURCE14} %{buildroot}%{_initrddir}/quantum-nec-agent
+install -p -D -m 755 %{SOURCE15} %{buildroot}%{_initrddir}/quantum-dhcp-agent
+install -p -D -m 755 %{SOURCE16} %{buildroot}%{_initrddir}/quantum-l3-agent
++install -p -D -m 755 %{SOURCE17} %{buildroot}%{_initrddir}/quantum-metadata-agent
++install -p -D -m 755 %{SOURCE18} %{buildroot}%{_initrddir}/quantum-ovs-cleanup
# Setup directories
+install -d -m 755 %{buildroot}%{_datadir}/quantum
install -d -m 755 %{buildroot}%{_sharedstatedir}/quantum
install -d -m 755 %{buildroot}%{_localstatedir}/log/quantum
+install -d -m 755 %{buildroot}%{_localstatedir}/run/quantum
# Install setup helper scripts
install -p -D -m 755 %{SOURCE4} %{buildroot}%{_bindir}/quantum-server-setup
@@@ -308,14 -386,13 +411,24 @@@ install -p -D -m 755 %{SOURCE5} %{build
install -p -D -m 755 %{SOURCE6} %{buildroot}%{_bindir}/quantum-dhcp-setup
install -p -D -m 755 %{SOURCE7} %{buildroot}%{_bindir}/quantum-l3-setup
+# Install upstart jobs examples
+install -p -m 644 %{SOURCE20} %{buildroot}%{_datadir}/quantum/
+install -p -m 644 %{SOURCE21} %{buildroot}%{_datadir}/quantum/
+install -p -m 644 %{SOURCE22} %{buildroot}%{_datadir}/quantum/
+install -p -m 644 %{SOURCE23} %{buildroot}%{_datadir}/quantum/
+install -p -m 644 %{SOURCE24} %{buildroot}%{_datadir}/quantum/
+install -p -m 644 %{SOURCE25} %{buildroot}%{_datadir}/quantum/
+install -p -m 644 %{SOURCE26} %{buildroot}%{_datadir}/quantum/
++install -p -m 644 %{SOURCE27} %{buildroot}%{_datadir}/quantum/
++install -p -m 644 %{SOURCE28} %{buildroot}%{_datadir}/quantum/
++
+ # Install version info file
+ cat > %{buildroot}%{_sysconfdir}/quantum/release <<EOF
+ [Quantum]
+ vendor = Fedora Project
+ product = OpenStack Quantum
+ package = %{release}
+ EOF
%pre
getent group quantum >/dev/null || groupadd -r quantum --gid 164
@@@ -334,18 -411,26 +447,23 @@@ f
%preun
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
- /bin/systemctl --no-reload disable quantum-server.service > /dev/null 2>&1 || :
- /bin/systemctl stop quantum-server.service > /dev/null 2>&1 || :
- /bin/systemctl --no-reload disable quantum-dhcp-agent.service > /dev/null 2>&1 || :
- /bin/systemctl stop quantum-dhcp-agent.service > /dev/null 2>&1 || :
- /bin/systemctl --no-reload disable quantum-l3-agent.service > /dev/null 2>&1 || :
- /bin/systemctl stop quantum-l3-agent.service > /dev/null 2>&1 || :
- /bin/systemctl --no-reload disable quantum-metadata-agent.service > /dev/null 2>&1 || :
- /bin/systemctl stop quantum-metadata-agent.service > /dev/null 2>&1 || :
+ /sbin/service quantum-server stop >/dev/null 2>&1
+ /sbin/chkconfig --del quantum-server
+ /sbin/service quantum-dhcp-agent stop >/dev/null 2>&1
+ /sbin/chkconfig --del quantum-dhcp-agent
+ /sbin/service quantum-l3-agent stop >/dev/null 2>&1
+ /sbin/chkconfig --del quantum-l3-agent
++ /sbin/service quantum-metadata-agent stop >/dev/null 2>&1
++ /sbin/chkconfig --del quantum-metadata-agent
fi
-
%postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
- /bin/systemctl try-restart quantum-server.service >/dev/null 2>&1 || :
- /bin/systemctl try-restart quantum-dhcp-agent.service >/dev/null 2>&1 || :
- /bin/systemctl try-restart quantum-l3-agent.service >/dev/null 2>&1 || :
- /bin/systemctl try-restart quantum-metadata-agent.service >/dev/null 2>&1 || :
+ /sbin/service quantum-server condrestart >/dev/null 2>&1 || :
++ /sbin/service quantum-dhcp-agent condrestart >/dev/null 2>&1 || :
++ /sbin/service quantum-l3-agent condrestart >/dev/null 2>&1 || :
++ /sbin/service quantum-metadata-agent condrestart >/dev/null 2>&1 || :
fi
@@@ -439,14 -515,13 +560,17 @@@ f
%{_bindir}/quantum-rootwrap
%{_bindir}/quantum-server
%{_bindir}/quantum-server-setup
+ %{_bindir}/quantum-usage-audit
-%{_unitdir}/quantum-dhcp-agent.service
-%{_unitdir}/quantum-l3-agent.service
-%{_unitdir}/quantum-metadata-agent.service
-%{_unitdir}/quantum-server.service
+%{_initrddir}/quantum-server
+%{_initrddir}/quantum-dhcp-agent
+%{_initrddir}/quantum-l3-agent
+%dir %{_datadir}/quantum
+%{_datadir}/quantum/quantum-server.upstart
+%{_datadir}/quantum/quantum-dhcp-agent.upstart
++%{_datadir}/quantum/quantum-metadata-agent.upstart
+%{_datadir}/quantum/quantum-l3-agent.upstart
%dir %{_sysconfdir}/quantum
+ %{_sysconfdir}/quantum/release
%config(noreplace) %attr(0640, root, quantum) %{_sysconfdir}/quantum/api-paste.ini
%config(noreplace) %attr(0640, root, quantum) %{_sysconfdir}/quantum/dhcp_agent.ini
%config(noreplace) %attr(0640, root, quantum) %{_sysconfdir}/quantum/l3_agent.ini
@@@ -529,8 -633,9 +683,11 @@@
%doc LICENSE
%doc quantum/plugins/openvswitch/README
%{_bindir}/quantum-openvswitch-agent
+ %{_bindir}/quantum-ovs-cleanup
-%{_unitdir}/quantum-openvswitch-agent.service
-%{_unitdir}/quantum-ovs-cleanup.service
+%{_initrddir}/quantum-openvswitch-agent
+%{_datadir}/quantum/quantum-openvswitch-agent.upstart
++%{_initrddir}/quantum-ovs-cleanup
++%{_datadir}/quantum/quantum-ovs-cleanup.upstart
%{python_sitelib}/quantum/plugins/openvswitch
%{_datarootdir}/quantum/rootwrap/openvswitch-plugin.filters
%dir %{_sysconfdir}/quantum/plugins/openvswitch
@@@ -570,11 -681,41 +735,43 @@@
%changelog
+ * Mon Feb 25 2013 Robert Kukura <rkukura at redhat.com> - 2013.1-0.4.g3
+ - Update to grizzly milestone 3
+ - Add brocade, hyperv, midonet, and plumgrid plugins as sub-packages
+ - Remove cisco files that were eliminated
+ - Add quantum-check-nvp-config
+ - Include patch for https://code.launchpad.net/bugs/1132889
+ - Require python-oslo-config
+ - Require compatible version of python-sqlalchemy
+ - Various spec file improvements
+
+ * Thu Feb 15 2013 Robert Kukura <rkukura at redhat.com> - 2013.1-0.3.g2
+ - Update to grizzly milestone 2
+ - Add quantum-db-manage, quantum-metadata-agent,
+ quantum-ns-metadata-proxy, quantum-ovs-cleanup, and
+ quantum-usage-audit executables
+ - Add systemd units for quantum-metadata-agent and quantum-ovs-cleanup
+ - Fix /etc/quantum/policy.json permissions (bug 877600)
+ - Require dnsmasq (bug 890041)
+ - Add the version info file
+ - Remove python-lxml dependency
+ - Add python-alembic dependency
+
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2013.1-0.2.g1
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+ * Wed Dec 5 2012 Robert Kukura <rkukura at redhat.com> - 2013.1-0.1.g1
+ - Update to grizzly milestone 1
+ - Require python-quantumclient >= 1:2.1.10
+ - Remove unneeded rpc control_exchange patch
+ - Add bigswitch plugin as sub-package
+ - Work around bigswitch conf file missing from setup.py
+
+* Wed Jan 23 2013 Martin Magr <mmagr at redhat.com> - 2012.2.1-1
+- Added python-keystone requirement
+
* Mon Dec 3 2012 Robert Kukura <rkukura at redhat.com> - 2012.2.1-1
- Update to folsom stable 2012.2.1
-- Turn off PrivateTmp for dhcp_agent and l3_agent (bug 872689)
- Add upstream patch: Fix rpc control_exchange regression.
- Remove workaround for missing l3_agent.ini
More information about the scm-commits
mailing list