[openstack-tripleo-heat-templates] Don't replace OS::Neutron::Port on update

[slagle]

commit 188fd24fb6acc35eeb43fc6018ea049d9d866a3e
Author: James Slagle <jslagle at redhat.com>
Date:   Mon Dec 15 15:49:48 2014 -0500

    Don't replace OS::Neutron::Port on update

 0005-Don-t-replace-OS-Neutron-Port-on-update.patch |   74 ++++++++++++++++++++
 openstack-tripleo-heat-templates.spec              |    7 ++-
 2 files changed, 80 insertions(+), 1 deletions(-)
---
diff --git a/0005-Don-t-replace-OS-Neutron-Port-on-update.patch b/0005-Don-t-replace-OS-Neutron-Port-on-update.patch
new file mode 100644
index 0000000..692ab5b
--- /dev/null
+++ b/0005-Don-t-replace-OS-Neutron-Port-on-update.patch
@@ -0,0 +1,74 @@
+From ae07dbd8a9ddd677cc94b777b9dc4ed9fb34c8f8 Mon Sep 17 00:00:00 2001
+From: Steve Hardy <shardy at redhat.com>
+Date: Tue, 28 Oct 2014 19:22:18 +0000
+Subject: [PATCH] Don't replace OS::Neutron::Port on update
+
+Due to an ununsual interface to OS::Neutron::Port resources,
+it's necessary to specify replacement_policy: AUTO, or the
+resource is unconditionally replaced on every stack update.
+
+I've started discussion re possibly changing the default in
+Heat, but right now, we need this or we have the bad outcome
+of replacing all (!) compute and controller nodes on every
+stack-update, even if the templates are unmodified.
+
+Passing the AUTO value should be safe regardless of any
+potential change of default value in Heat.
+
+Change-Id: I6dd02ae17407f8f4c81ae418e5027f4f38ae4e9b
+Closes-Bug: #1383709
+---
+ overcloud-source.yaml          | 2 ++
+ overcloud-vlan-port.yaml       | 1 +
+ overcloud-without-mergepy.yaml | 2 ++
+ 3 files changed, 5 insertions(+)
+
+diff --git a/overcloud-source.yaml b/overcloud-source.yaml
+index b2042d0..7de25bb 100644
+--- a/overcloud-source.yaml
++++ b/overcloud-source.yaml
+@@ -351,6 +351,7 @@ resources:
+       network_id: {get_param: NeutronControlPlaneID}
+       fixed_ips:
+         get_param: ControlFixedIPs
++      replacement_policy: AUTO
+   MysqlClusterUniquePart:
+     type: OS::Heat::RandomString
+     properties:
+@@ -366,6 +367,7 @@ resources:
+       network: {get_param: PublicVirtualNetwork}
+       fixed_ips:
+         get_param: PublicVirtualFixedIPs
++      replacement_policy: AUTO
+   RabbitCookie:
+     type: OS::Heat::RandomString
+     properties:
+diff --git a/overcloud-vlan-port.yaml b/overcloud-vlan-port.yaml
+index 71b444f..8f6f693 100644
+--- a/overcloud-vlan-port.yaml
++++ b/overcloud-vlan-port.yaml
+@@ -36,3 +36,4 @@ resources:
+     properties:
+       name: controller0_vlan
+       network: public
++      replacement_policy: AUTO
+diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
+index abb6973..505c2cc 100644
+--- a/overcloud-without-mergepy.yaml
++++ b/overcloud-without-mergepy.yaml
+@@ -637,6 +637,7 @@ resources:
+       name: control_virtual_ip
+       network_id: {get_param: NeutronControlPlaneID}
+       fixed_ips: {get_param: ControlFixedIPs}
++      replacement_policy: AUTO
+ 
+   PublicVirtualIP:
+     type: OS::Neutron::Port
+@@ -644,6 +645,7 @@ resources:
+       name: public_virtual_ip
+       network: {get_param: PublicVirtualNetwork}
+       fixed_ips: {get_param: PublicVirtualFixedIPs}
++      replacement_policy: AUTO
+ 
+   ControllerBootstrapNodeConfig:
+     type: OS::Heat::StructuredConfig
diff --git a/openstack-tripleo-heat-templates.spec b/openstack-tripleo-heat-templates.spec
index af1a8ab..9e341cb 100644
--- a/openstack-tripleo-heat-templates.spec
+++ b/openstack-tripleo-heat-templates.spec
@@ -1,7 +1,7 @@
 Name:		openstack-tripleo-heat-templates
 Summary:	Heat templates for TripleO
 Version:	0.7.9
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
 URL:		https://wiki.openstack.org/wiki/TripleO
@@ -11,6 +11,7 @@ Patch0001: 0001-Compute-and-controller-templates-without-merge.py.patch
 Patch0002: 0002-Add-converted-version-of-block-and-object-storage.patch
 Patch0003: 0003-Align-the-cinder-storage.yaml-template-with-block-st.patch
 Patch0004: 0004-Remove-missing-cinder-storage-Neutron-parameters.patch
+Patch0005: 0005-Don-t-replace-OS-Neutron-Port-on-update.patch
 
 BuildArch:	noarch
 BuildRequires:	python2-devel
@@ -31,6 +32,7 @@ building Heat Templates to do deployments of OpenStack.
 %patch0002 -p1
 %patch0003 -p1
 %patch0004 -p1
+%patch0005 -p1
 
 %build
 %{__python2} setup.py build
@@ -48,6 +50,9 @@ cp -ar *.yaml %{buildroot}/%{_datadir}/%{name}
 %{_bindir}/tripleo-heat-merge
 
 %changelog
+* Mon Dec 15 2014 James Slagle <jslagle at redhat.com> 0.7.9-8
+- Don't replace OS::Neutron::Port on update
+
 * Wed Dec 10 2014 James Slagle <jslagle at redhat.com> 0.7.9-7
 - Remove missing cinder-storage Neutron* parameters