[openstack-nova] Avoid killing dnsmasq on network service shutdown (#805947)

[Mark McLoughlin]

commit 7e7f759b0ea14b90ba034c018ddf12345c1df2e0
Author: Mark McLoughlin <markmc at redhat.com>
Date:   Mon Mar 26 08:47:37 2012 +0100

    Avoid killing dnsmasq on network service shutdown (#805947)

 openstack-nova-network.service |    3 +++
 openstack-nova.spec            |    5 ++++-
 2 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/openstack-nova-network.service b/openstack-nova-network.service
index 542ddb1..40a9ceb 100644
--- a/openstack-nova-network.service
+++ b/openstack-nova-network.service
@@ -7,6 +7,9 @@ Type=simple
 User=nova
 ExecStart=/usr/bin/nova-network --config-file /etc/nova/nova.conf --logfile /var/log/nova/network.log
 
+# Don't kill dnsmasq on shutdown (#805947)
+KillMode=process
+
 [Install]
 WantedBy=multi-user.target
 
diff --git a/openstack-nova.spec b/openstack-nova.spec
index d9fa9db..8e43092 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -5,7 +5,7 @@ Version:          2012.1
 # The Release is in form 0.X.tag as per:
 #   http://fedoraproject.org/wiki/Packaging:NamingGuidelines#Pre-Release_packages
 # So for prereleases always increment X
-Release:          0.8.rc1%{?dist}
+Release:          0.9.rc1%{?dist}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
@@ -365,6 +365,9 @@ fi
 %endif
 
 %changelog
+* Mon Mar 26 2012 Mark McLoughlin <markmc at redhat.com> - 2012.1-0.9.rc1
+- Avoid killing dnsmasq on network service shutdown (#805947)
+
 * Tue Mar 20 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.8.rc1
 - Update to Essex release candidate 1