[openstack-nova/el6-havana] Add the second dhcpbridge-flagfile to nova-dist.conf

[Nikola Dipanov]

commit d16fd6ca8eb08bc7f7bde7e0e241a84d6c19b09b
Author: Xavier Queralt <xqueralt at redhat.com>
Date:   Thu Aug 8 14:51:02 2013 +0200

    Add the second dhcpbridge-flagfile to nova-dist.conf

 nova-dist.conf      |    1 +
 openstack-nova.spec |    5 ++++-
 2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/nova-dist.conf b/nova-dist.conf
index 958f882..b1cdfe6 100644
--- a/nova-dist.conf
+++ b/nova-dist.conf
@@ -4,6 +4,7 @@ state_path = /var/lib/nova
 lock_path = /var/lib/nova/tmp
 volumes_dir = /etc/nova/volumes
 dhcpbridge = /usr/bin/nova-dhcpbridge
+dhcpbridge_flagfile = /usr/share/nova/nova-dist.conf
 dhcpbridge_flagfile = /etc/nova/nova.conf
 force_dhcp_release = True
 injected_network_template = /usr/share/nova/interfaces.template
diff --git a/openstack-nova.spec b/openstack-nova.spec
index dbf497d..f35be4d 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -2,7 +2,7 @@
 
 Name:             openstack-nova
 Version:          2013.2
-Release:          0.10.b2%{?dist}
+Release:          0.11.b2%{?dist}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
@@ -922,6 +922,9 @@ fi
 %endif
 
 %changelog
+* Tue Aug 27 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-0.11.b2
+- Add the second dhcpbridge-flagfile to nova-dist.conf 
+
 * Tue Aug 27 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-0.10.b2
 - Change the default config to poll for DB connection indefinitely