From: Robert Collins <rbtcollins@hp.com>
Date: Tue, 17 Dec 2013 02:26:32 +0000 (+1300)
Subject: Permit setting overcloud image update policies.
X-Git-Tag: opnfv-6.0.0~2907
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f6289d012740c730ac1b9b0ea8a3842f8c72149e;p=apex-tripleo-heat-templates.git

Permit setting overcloud image update policies.

This is the first step towards preserving state on stack updates when the image
id has changed.

I chose REPLACE as the default value because that is the current behaviour and
we can override it from the command line.

Change-Id: I64eab51892922ab51a89a9f389457fd1ed979fb2
---

diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 2aadea8d..e10b1dc5 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -14,6 +14,10 @@ Parameters:
     Description: Use this flavor
     Type: String
     Default: baremetal
+  ImageUpdatePolicy:
+    Default: 'REPLACE'
+    Description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt.
+    Type: String
   NovaImage:
     Type: String
     Default: overcloud-compute
@@ -81,6 +85,8 @@ Resources:
     Properties:
       image:
         {Ref: NovaImage}
+      image_update_policy:
+        Ref: ImageUpdatePolicy
       flavor: {Ref: Flavor}
       key_name: {Ref: KeyName}
     Metadata:
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 57a5560e..754dbbee 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -31,6 +31,10 @@ Parameters:
     Description: The password for the Heat service account, used by the Heat services.
     Type: String
     NoEcho: true
+  ImageUpdatePolicy:
+    Default: 'REPLACE'
+    Description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt.
+    Type: String
   KeyName:
     Default: default
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
@@ -317,6 +321,8 @@ Resources:
     Properties:
       image:
         Ref: notcomputeImage
+      image_update_policy:
+        Ref: ImageUpdatePolicy
       flavor:
         Ref: Flavor
       key_name: