[openstack-nova/el6-havana] update /etc/sysconfig/openstack-nova-novncproxy correctly

[Pádraig Brady]

commit b9443f2f0424d3cf523302131bf2f24a5587bfdb
Author: Pádraig Brady <P at draigBrady.com>
Date:   Thu Jul 18 03:49:51 2013 +0100

    update /etc/sysconfig/openstack-nova-novncproxy correctly
    
    This file was not marked as "config" in novnc,
    so we include the template in this package and
    mark it as config(noreplace) so that any user edits
    are left in place.
    
    rpm on upgrade will maintain the file when the new package
    has the file marked as config, even if it wasn't so marked
    in the original package.
    
    Conflicts:
    
    	openstack-nova.spec

 openstack-nova-novncproxy.sysconfig |    2 ++
 openstack-nova.spec                 |   12 +++++++++++-
 2 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/openstack-nova-novncproxy.sysconfig b/openstack-nova-novncproxy.sysconfig
new file mode 100644
index 0000000..8c905ed
--- /dev/null
+++ b/openstack-nova-novncproxy.sysconfig
@@ -0,0 +1,2 @@
+# You may specify other parameters to the nova-novncproxy here
+#OPTIONS=
diff --git a/openstack-nova.spec b/openstack-nova.spec
index af4f436..72c67a8 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -47,6 +47,8 @@ Source20:         nova-sudoers
 Source21:         nova-polkit.pkla
 Source22:         nova-ifc-template
 
+Source30:         openstack-nova-novncproxy.sysconfig
+
 #
 # patches_base=2013.2.b1
 #
@@ -554,6 +556,10 @@ install -p -D -m 644 etc/nova/rootwrap.d/* %{buildroot}%{_datarootdir}/nova/root
 install -d -m 755 %{buildroot}%{_sysconfdir}/polkit-1/localauthority/50-local.d
 install -p -D -m 644 %{SOURCE21} %{buildroot}%{_sysconfdir}/polkit-1/localauthority/50-local.d/50-nova.pkla
 
+# Install novncproxy service options template
+install -d %{buildroot}%{_sysconfdir}/sysconfig
+install -p -m 0644 %{SOURCE30} %{buildroot}%{_sysconfdir}/sysconfig/openstack-nova-novncproxy
+
 # Remove unneeded in production stuff
 rm -f %{buildroot}%{_bindir}/nova-debug
 rm -fr %{buildroot}%{python_sitelib}/nova/tests/
@@ -852,6 +858,7 @@ fi
 %{_bindir}/nova-novncproxy
 %{_initrddir}/openstack-nova-novncproxy
 %{_datarootdir}/nova/openstack-nova-novncproxy.upstart
+%config(noreplace) %{_sysconfdir}/sysconfig/openstack-nova-novncproxy
 
 %files -n python-nova
 %defattr(-,root,root,-)
@@ -865,7 +872,10 @@ fi
 %endif
 
 %changelog
-* Mon Jun 24 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.6.b1
+* Wed Jul 17 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2-0.6.b1
+- Upgrade /etc/sysconfig/openstack-nova-novncproxy correctly
+
+* Mon Jun 24 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.5.h1
 - Remove requirements file to be more flexible with dep versions
 
 * Mon Jun 24 2013 Nikola Đipanov<ndipanov at redhat.com> - 2013.2-0.4.h1