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

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index a205e07..742429f 100644 (file)
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -370,6 +370,7 @@ resources:
       network_id: {get_param: NeutronControlPlaneID}
       fixed_ips:
         get_param: ControlFixedIPs
+      replacement_policy: AUTO
   MysqlClusterUniquePart:
     type: OS::Heat::RandomString
     properties:
@@ -385,6 +386,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 (file)
--- 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 cb4f25c..d38a398 100644 (file)
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -569,6 +569,7 @@ resources:
       name: control_virtual_ip
       network_id: {get_param: NeutronControlPlaneID}
       fixed_ips: {get_param: ControlFixedIPs}
+      replacement_policy: AUTO
 
   PublicVirtualIP:
     type: OS::Neutron::Port
@@ -576,6 +577,7 @@ resources:
       name: public_virtual_ip
       network: {get_param: PublicVirtualNetwork}
       fixed_ips: {get_param: PublicVirtualFixedIPs}
+      replacement_policy: AUTO
 
   ControllerBootstrapNodeConfig:
     type: OS::Heat::StructuredConfig