aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Hardy <shardy@redhat.com>2014-10-28 19:22:18 +0000
committerSteven Hardy <shardy@redhat.com>2014-10-28 19:29:50 +0000
commit9cf073075c4331ebd323768a11deda30e975d22d (patch)
tree3a9d8a6b7161f3810f1bf5770cac74b14b73e3f4
parent04dd8be0108a953aa82510d8ec85313a546cc0a7 (diff)
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
-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 a1e71f00..070ffe8c 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 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