From b3b9b44dae232447d5d3fc181a4f7922ef85b597 Mon Sep 17 00:00:00 2001
From: Rabi Mishra <ramishra@redhat.com>
Date: Wed, 22 May 2019 10:14:59 +0530
Subject: [PATCH] Add {{role.name}}RemovalPoliciesMode parameter

This adds a new paramter to reset/update existing blacklisted nodes
set prior to this update with either node delete or using parameter
{{role.name}}RemovalPolicies.

Change-Id: I870d7605e35a7cda76d9de0e8830a87c898533d6
---
 overcloud.j2.yaml                                      | 10 ++++++++++
 .../add-removal-policies-mode-6869362fbeed2cd2.yaml    |  6 ++++++
 2 files changed, 16 insertions(+)
 create mode 100644 releasenotes/notes/add-removal-policies-mode-6869362fbeed2cd2.yaml

diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 4837f87163..0efd9ba85d 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -201,6 +201,15 @@ parameters:
       doing an update which requires removal of specific resources.
       Example format ComputeRemovalPolicies: [{'resource_list': ['0']}]
 
+  {{role.name}}RemovalPoliciesMode:
+    default: append
+    type: string
+    description: >
+      How to handle change to RemovalPolicies for {{role.name}}
+      ResourceGroup when doing an update. Default mode 'append' will
+      append to the existing blacklist and 'update' would replace
+      the blacklist.
+
   {{role.name}}SchedulerHints:
     type: json
     description: Optional scheduler hints to pass to nova
@@ -655,6 +664,7 @@ resources:
     properties:
       count: {get_param: {{role.name}}Count}
       removal_policies: {get_param: {{role.name}}RemovalPolicies}
+      removal_policies_mode: {get_param: {{role.name}}RemovalPoliciesMode}
       resource_def:
         type: OS::TripleO::{{role.name}}
         properties:
diff --git a/releasenotes/notes/add-removal-policies-mode-6869362fbeed2cd2.yaml b/releasenotes/notes/add-removal-policies-mode-6869362fbeed2cd2.yaml
new file mode 100644
index 0000000000..861555cdbe
--- /dev/null
+++ b/releasenotes/notes/add-removal-policies-mode-6869362fbeed2cd2.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    The parameter {{role.name}}RemovalPoliciesMode can be set to 'update' to
+    reset the existing blacklisted nodes in heat. This will help re-use the
+    node indexes when required.