[openstack-quantum/el6: 2/2] Merge branch 'master' into el6

[Pádraig Brady]

commit 230a4107d0a9282bef81389195d6be1e6bfbdc46
Merge: dde1b22 69eccfd
Author: Pádraig Brady <P at draigBrady.com>
Date:   Mon May 28 02:22:51 2012 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	openstack-quantum.spec

 openstack-quantum.spec |    9 +++++----
 quantum-config-set     |   24 ------------------------
 quantum-node-setup     |   34 +++++++++++++++++-----------------
 quantum-server-setup   |   44 ++++++++++++++++++++++----------------------
 4 files changed, 44 insertions(+), 67 deletions(-)
---
diff --cc openstack-quantum.spec
index 6afe4d2,34fd693..2930c32
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@@ -4,7 -4,7 +4,7 @@@
  
  Name:		openstack-quantum
  Version:	2012.1
- Release:	4%{?dist}
 -Release:	2%{?dist}
++Release:	5%{?dist}
  Summary:	Virtual network service for OpenStack (quantum)
  
  Group:		Applications/System
@@@ -40,12 -31,12 +39,13 @@@ BuildRequires:	python-routes1.1
  BuildRequires:	dos2unix
  
  Requires:	python-quantum = %{version}-%{release}
+ Requires:	openstack-utils
  
 -Requires(pre):	shadow-utils
 -Requires(post): systemd-units
 -Requires(preun): systemd-units
 -Requires(postun): systemd-units
 +Requires(post):   chkconfig
 +Requires(postun): initscripts
 +Requires(preun):  chkconfig
 +Requires(preun):  initscripts
 +Requires(pre):    shadow-utils
  
  
  %description
@@@ -223,10 -212,8 +223,9 @@@ install -p -D -m 755 %{SOURCE13} %{buil
  # Setup directories
  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 %{SOURCE3} %{buildroot}%{_bindir}/quantum-config-set
  install -p -D -m 755 %{SOURCE4} %{buildroot}%{_bindir}/quantum-server-setup
  install -p -D -m 755 %{SOURCE5} %{buildroot}%{_bindir}/quantum-node-setup
  
@@@ -324,10 -302,9 +323,9 @@@ f
  %doc README
  %{_bindir}/quantum-server
  %{_bindir}/quantum-rootwrap
- %{_bindir}/quantum-config-set
  %{_bindir}/quantum-server-setup
  %{_bindir}/quantum-node-setup
 -%{_unitdir}/quantum-server.service
 +%{_initrddir}/quantum-server
  %dir %{_sysconfdir}/quantum
  %config(noreplace) %{_sysconfdir}/quantum/quantum.conf
  %config(noreplace) %{_sysconfdir}/quantum/plugins.ini
@@@ -421,14 -398,50 +419,17 @@@
  
  
  %changelog
 -* Mon May 28 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-2
++* 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
+ 
 -* 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
 -
 -* Mon 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
 -
 -* Thu Nov  18 2011 Robert Kukura <rkukura at redhat.com> - 2011.3-1
 -- Initial package for Fedora
 +* 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 May 01 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-3
 +- Start the services later in the boot sequence
 +
 +* 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
 +
 +* Thu Apr 12 2012 Pádraig Brady <pbrady at redhat.com> - 2012.1-1
 +- Initial essex release