summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-10-30 16:38:34 +0000
committerGerrit Code Review <review@openstack.org>2014-10-30 16:38:34 +0000
commita9d03c8ba7f6b423f1280da604e00d2e96236c67 (patch)
tree6b5a26fce01ac6d70da99c98a200075555a6008d
parentb6fac3c901189a081e80cc1fb43f09e3d6a2f8f7 (diff)
parent9cf073075c4331ebd323768a11deda30e975d22d (diff)
Merge "Don't replace OS::Neutron::Port on update"
-rw-r--r--overcloud-source.yaml2
-rw-r--r--overcloud-vlan-port.yaml1
-rw-r--r--overcloud-without-mergepy.yaml2
3 files changed, 5 insertions, 0 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index a205e074..742429f1 100644
--- 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 71b444fb..8f6f6937 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 cb4f25c3..d38a3987 100644
--- 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