Merge "Support actual hostnames in DeploymentServerBlacklist" into stable/wallaby

puppet/role.role.j2.yaml

@@ -195,14 +195,23 @@ parameter_groups:
 
 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
 {%- if role.deprecated_param_image is defined %}
   deprecated_param_image_set:
     not:

releasenotes/notes/support-hostname-deployment-server-blacklist-532221db0e7d2bef.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    DeploymentServerBlacklist parameter now supports both
+    heat and actual hostnames.