Merge "Support actual hostnames in DeploymentServerBlacklist"

openstack-archive · Oct 31, 2022 · dfcf977 · dfcf977
2 parents ae365c4 + 3e41f36
commit dfcf977
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git 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
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    DeploymentServerBlacklist parameter now supports both
+    heat and actual hostnames.