[openstack-quantum/el6: 9/10] Merge remote-tracking branch 'origin/f18' into el6
Terry Wilson
otherwiseguy at fedoraproject.org
Thu Mar 7 23:13:35 UTC 2013
commit 2e371a596ccaaa393eae352f2c37a14f134a75b5
Merge: 998ce22 3e577fa
Author: Terry Wilson <twilson at redhat.com>
Date: Thu Mar 7 15:06:34 2013 -0600
Merge remote-tracking branch 'origin/f18' into el6
Conflicts:
openstack-quantum.spec
.gitignore | 2 +-
openstack-quantum.spec | 81 ++++++++++++++++++++++++++++++++++++++-----
quantum-node-setup | 5 +++
quantum-ovs-cleanup.service | 13 +++++++
quantum-server-setup | 2 +
sources | 2 +-
6 files changed, 94 insertions(+), 11 deletions(-)
---
diff --cc openstack-quantum.spec
index 4d431af,206f99e..af9603f
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@@ -19,31 -19,19 +19,31 @@@ 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-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-ovs-cleanup.init
++Source27: quantum-ovs-clenaup.upstart
+
+# This is EPEL specific and not upstream
+Patch100: openstack-quantum-newdeps.patch
+
+
#
- # patches_base=2012.2.1
+ # patches_base=2012.2.3
#
- # Upstream stable branch patch https://review.openstack.org/17236
- Patch1: quantum.git-8017d0932c54078e7e18058e78f12c76d68462c7.patch
-
BuildArch: noarch
BuildRequires: python2-devel
@@@ -219,10 -201,6 +219,9 @@@ networks using multiple other quantum p
%prep
%setup -q -n quantum-%{version}
- %patch1 -p1
+# Apply EPEL patch
+%patch100 -p1
+
find quantum -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
chmod 644 quantum/plugins/cisco/README
@@@ -287,20 -268,19 +289,21 @@@ 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-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-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 -288,6 +311,15 @@@ 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/
%pre
getent group quantum >/dev/null || groupadd -r quantum --gid 164
@@@ -529,8 -489,9 +533,11 @@@ f
%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-ovs-cleanup.upstart
%{python_sitelib}/quantum/plugins/openvswitch
%{_datarootdir}/quantum/rootwrap/openvswitch-plugin.filters
%dir %{_sysconfdir}/quantum/plugins/openvswitch
@@@ -570,11 -529,22 +577,21 @@@
%changelog
- * Wed Jan 23 2013 Martin Magr <mmagr at redhat.com> - 2012.2.1-1
+ * Mon Mar 4 2013 Terry Wilson <twilson at redhat.com> 2012.2.3-2
+ - Add quantum-ovs-cleanup.service
+
+ * Mon Feb 11 2013 Alan Pevec <apevec at redhat.com> 2012.2.3-1
+ - Update to folsom stable 2012.2.3
+
+ * Wed Jan 23 2013 Martin Magr <mmagr at redhat.com> - 2012.2.1-2
- Added python-keystone requirement
+ * Mon Jan 21 2013 Gary Kotton <gkotton at redhat.com> - 2012.2.1-2
+ - Ensure libvirt_vif_driver is set with node installation (bug 885932)
+ - Cleanup of symbolic link plugin.ini (bug 901959)
+
* 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
@@@ -585,23 -552,99 +602,69 @@@
- Update to folsom final
- Require python-quantumclient >= 1:2.1.1
-* Sun Sep 23 2012 Gary Kotton <gkotton at redhat.com> - 2012.2-0.9.rc2
-- Update to folsom rc2
-
-* Sun Sep 16 2012 Robert Kukura <rkukura at redhat.com> - 2012.2-0.9.rc1
-- Fix setting admin_user in quantum_l3_setup
-
-* Fri Sep 14 2012 Robert Kukura <rkukura at redhat.com> - 2012.2-0.8.rc1
-- Setup script fixes from garyk
-- Fix openvswitch service config file path
-- Make log file names consistent with service names
-
-* Thu Sep 13 2012 Robert Kukura <rkukura at redhat.com> - 2012.2-0.7.rc1
-- Fix various issues in setup scripts
-- Configure quantum-dhcp-agent to store files under /var/lib/quantum
-- Make config files with passwords world-unreadable
-- Replace bug workarounds with upstream patches
+* Tue Aug 21 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-8
+- fix database config generated by install scripts (#847785)
-* Wed Sep 12 2012 Robert Kukura <rkukura at redhat.com> - 2012.2-0.6.rc1
-- Require python-quantumclient >= 2.0.22
-- Add bug references for work-arounds
-- Use /usr/share/quantum/rootwrap instead of /usr/share/quantum/filters
+* Wed Jul 25 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-6
+- Update to 20120715 essex stable branch snapshot
-* 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
-
-* Wed Aug 22 2012 Pádraig Brady <P at draigBrady.com> - 2012.2-0.3.f2
-- Fix helper scripts to setup the database config correctly (#847785)
+* Mon May 28 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-5
+- Fix helper scripts to use the always available openstack-config util
-* Tue Aug 7 2012 Robert Kukura <rkukura at redhat.com> - 2012.2-0.2.f2
-- Include quantum module no longer provided by python-quantumclient
-- Update description text
-- Disable setuptools_git dependency
+* Mon May 07 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-4
+- Fix handling of the mysql service in quantum-server-setup
-* Tue Aug 7 2012 Robert Kukura <rkukura at redhat.com> - 2012.2-0.1.f2
-- Update to folsom milestone 2
+* Tue May 01 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-3
+- Start the services later in the boot sequence
-* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2012.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+* Wed Apr 25 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-2
+- Use parallel installed versions of python-routes and python-paste-deploy
-* 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
+* Thu Apr 12 2012 Pádraig Brady <pbrady at redhat.com> - 2012.1-1
+- Initial essex release
+
+ * Mon Apr 9 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-1
+ - Update to essex release
+
+ * Thu Apr 5 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-0.7.rc2
+ - Update to essex rc2 milestone
+ - Use PrivateTmp for services
+
+ * Wed Mar 21 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-0.6.rc1
+ - Update to official essex rc1 milestone
+ - Add quantum-server-setup and quantum-node-setup scripts
+ - Use hand-coded agent executables rather than easy-install scripts
+ - Make plugin config files mode 640 and group quantum to protect passwords
+
+ * Mon Mar 19 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-0.5.e4
+ - Update to essex possible RC1 tarball
+ - Remove patches incorporated upstream
+ - Don't package test code
+ - Remove dependencies only needed by test code
+
+ * Wed Mar 14 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-0.4.e4
+ - Upstream patch: add root_helper to quantum agents
+ - Add sudoers file enabling quantum-rootwrap for quantum user
+ - Configure plugin agents to use quantum-rootwrap
+ - Run plugin agents as quantum user
+
+ * Fri Mar 9 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-0.3.e4
+ - Add upstream patch: remove pep8 and strict lxml version from setup.py
+ - Remove old fix for pep8 dependency
+ - Add upstream patch: Bug #949261 Removing nova drivers for Linux Bridge Plugin
+ - Add openvswitch dependency
+
+ * 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
+
+ * Tue Jan 31 2012 Robert Kukura <rkukura at redhat.com> - 2012.1-0.1.e3
+ - Update to essex milestone 3 for F17
+
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2011.3-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+ * Fri Nov 18 2011 Robert Kukura <rkukura at redhat.com> - 2011.3-1
+ - Initial package for Fedora
++>>>>>>> origin/f18
More information about the scm-commits
mailing list