openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Support actual hostnames in DeploymentServerBlacklist"

This commit is contained in:
Zuul 2022-10-31 17:23:34 +00:00 committed by Gerrit Code Review
parent ae365c45b8 3e41f36368
commit dfcf977ee8
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
puppet/role.role.j2.yaml
View File

@ -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:

5
releasenotes/notes/support-hostname-deployment-server-blacklist-532221db0e7d2bef.yaml Normal file
View File

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