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

[Russell Bryant]

commit b3e3b9d086ab99291d29c6c698a98b4de6f64851
Merge: 3e04602 730f662
Author: Russell Bryant <rbryant at redhat.com>
Date:   Tue Nov 29 11:49:49 2011 -0500

    Merge branch 'master' into el6

 nova.conf               |    1 +
 openstack-nova-db-setup |  170 +++++++++++++++++++++++++++++++++++++++++++++++
 openstack-nova.spec     |   20 +++---
 3 files changed, 180 insertions(+), 11 deletions(-)
---
diff --cc openstack-nova.spec
index 4c1152b,57e7cf5..afd4637
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@@ -2,7 -2,7 +2,7 @@@
  
  Name:             openstack-nova
  Version:          2011.3
--Release:          8%{?dist}
++Release:          9%{?dist}
  Summary:          OpenStack Compute (nova)
  
  Group:            Applications/System
@@@ -347,16 -349,11 +348,10 @@@ useradd --uid 162 -r -g nova -G nova,no
  exit 0
  
  %post
- # Initialize the DB
- if [ ! -f %{_sharedstatedir}/nova/nova.sqlite ]; then
-     runuser -l -s /bin/bash -c 'nova-manage --flagfile=/dev/null --logdir=%{_localstatedir}/log/nova --state_path=%{_sharedstatedir}/nova db sync' nova
-     chmod 600 %{_sharedstatedir}/nova/nova.sqlite
- fi
- 
 -if [ $1 -eq 1 ] ; then
 -    # Initial installation
 -    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 -fi
 -
 +# Register the services
 +for svc in api compute network objectstore scheduler volume direct-api ajax-console-proxy vncproxy; do
 +    /sbin/chkconfig --add openstack-nova-${svc}
 +done
  
  %preun
  if [ $1 -eq 0 ] ; then
@@@ -386,7 -385,8 +381,8 @@@ f
  %dir %attr(0755, nova, root) %{_localstatedir}/run/nova
  
  %{_bindir}/nova-*
 +%{_initrddir}/openstack-nova-*
+ %{_bindir}/openstack-nova-db-setup
 -%{_unitdir}/openstack-nova-*.service
  %{_datarootdir}/nova
  %{_mandir}/man1/nova*.1.gz
  
@@@ -428,10 -427,13 +423,13 @@@
  %endif
  
  %changelog
 -* Tue Nov 29 2011 Russell Bryant <rbryant at redhat.com> - 2011.3-8
++* Tue Nov 29 2011 Russell Bryant <rbryant at redhat.com> - 2011.3-9
+ - Change default database to mysql. (#735012)
+ 
 -* Mon Nov 14 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-7
 +* Mon Nov 14 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-8
  - Add ~20 significant fixes from upstream stable branch
  
 -* Wed Oct 26 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-6
 +* Wed Oct 26 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-7
  - Fix password leak in EC2 API (#749385, CVE 2011-4076)
  
  * Mon Oct 24 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-5