[openstack-nova/el6-icehouse] avoid commented [DEFAULT] config issue in nova.conf

[Pádraig Brady]

commit 843288bbde8472b80b0aa7c6c107dae362eb297a
Author: Pádraig Brady <P at draigBrady.com>
Date:   Mon Feb 3 16:20:27 2014 +0000

    avoid commented [DEFAULT] config issue in nova.conf
    
    Avoid http://bugzilla.redhat.com/1059815
    which causes packstack to mishandle commented [DEFAULT]
    entries in nova.conf when configuring for ceilometer.
    
    Conflicts:
    
    	openstack-nova.spec

 openstack-nova.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 7244e02..9ddd24c 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -2,7 +2,7 @@
 
 Name:             openstack-nova
 Version:          2014.1
-Release:          0.8.b2%{?dist}
+Release:          0.9.b2%{?dist}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
@@ -449,6 +449,9 @@ rm -rf {test-,}requirements.txt tools/{pip,test}-requires
 %build
 %{__python} setup.py build
 
+# Avoid http://bugzilla.redhat.com/1059815. Remove when that is closed
+sed -i 's|group/name|group;name|; s|\[DEFAULT\]/|DEFAULT;|' etc/nova/nova.conf.sample
+
 # Programmatically update defaults in sample config
 # which is installed at /etc/nova/nova.conf
 
@@ -893,6 +896,9 @@ fi
 %endif
 
 %changelog
+* Mon Feb 03 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1-0.9.b2
+- Avoid commented [DEFAULT] config issue in nova.conf
+
 * Mon Jan 27 2014 Xavier Queralt <xqueralt at redhat.com> - 2014.1-0.8.b2
 - Fix the patch for CVE-2013-7130 which was not backported properly