From 3e41f36368a6e9fa75b66f417a0cf1e5e9ca19c8 Mon Sep 17 00:00:00 2001
From: Rabi Mishra <ramishra@redhat.com>
Date: Mon, 12 Sep 2022 16:15:55 +0530
Subject: [PATCH] Support actual hostnames in DeploymentServerBlacklist

Historically, we only supported heat hostnames in
DeploymentServerBlacklist and this causes lots of
confusion, specifically when using ephemeral heat.
Let's support both.

Change-Id: Ifdc0ea99e02743739d6369101eac8476f28c25b8
---
 puppet/role.role.j2.yaml                      | 23 +++++++++++++------
 ...ent-server-blacklist-532221db0e7d2bef.yaml |  5 ++++
 2 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 releasenotes/notes/support-hostname-deployment-server-blacklist-532221db0e7d2bef.yaml

diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index 86a4f41b93..c03c787526 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -133,14 +133,23 @@ parameters:
 
 conditions:
   server_blacklisted:
-    equals:
-      - {get_param: [DeploymentServerBlacklistDict, {get_param: Hostname}]}
-      - 1
+    or:
+      - equals:
+          - {get_param: [DeploymentServerBlacklistDict, {get_param: Hostname}]}
+          - 1
+      - equals:
+          - {get_param: [DeploymentServerBlacklistDict, {get_param: [HostnameMap, {get_param: Hostname}]}]}
+          - 1
   server_not_blacklisted:
-    not:
-      equals:
-        - {get_param: [DeploymentServerBlacklistDict, {get_param: Hostname}]}
-        - 1
+    and:
+      - not:
+          equals:
+            - {get_param: [DeploymentServerBlacklistDict, {get_param: Hostname}]}
+            - 1
+      - not:
+          equals:
+            - {get_param: [DeploymentServerBlacklistDict, {get_param: [HostnameMap, {get_param: Hostname}]}]}
+            - 1
   ctlplane_fixed_ip_set:
     or:
       - not:
diff --git a/releasenotes/notes/support-hostname-deployment-server-blacklist-532221db0e7d2bef.yaml b/releasenotes/notes/support-hostname-deployment-server-blacklist-532221db0e7d2bef.yaml
new file mode 100644
index 0000000000..6061304e6a
--- /dev/null
+++ b/releasenotes/notes/support-hostname-deployment-server-blacklist-532221db0e7d2bef.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    DeploymentServerBlacklist parameter now supports both
+    heat and actual hostnames.