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
This commit is contained in:
parent
f9a4495c96
commit
3e41f36368
@ -133,13 +133,22 @@ parameters:
|
|||||||
|
|
||||||
conditions:
|
conditions:
|
||||||
server_blacklisted:
|
server_blacklisted:
|
||||||
|
or:
|
||||||
|
- equals:
|
||||||
|
- {get_param: [DeploymentServerBlacklistDict, {get_param: Hostname}]}
|
||||||
|
- 1
|
||||||
|
- equals:
|
||||||
|
- {get_param: [DeploymentServerBlacklistDict, {get_param: [HostnameMap, {get_param: Hostname}]}]}
|
||||||
|
- 1
|
||||||
|
server_not_blacklisted:
|
||||||
|
and:
|
||||||
|
- not:
|
||||||
equals:
|
equals:
|
||||||
- {get_param: [DeploymentServerBlacklistDict, {get_param: Hostname}]}
|
- {get_param: [DeploymentServerBlacklistDict, {get_param: Hostname}]}
|
||||||
- 1
|
- 1
|
||||||
server_not_blacklisted:
|
- not:
|
||||||
not:
|
|
||||||
equals:
|
equals:
|
||||||
- {get_param: [DeploymentServerBlacklistDict, {get_param: Hostname}]}
|
- {get_param: [DeploymentServerBlacklistDict, {get_param: [HostnameMap, {get_param: Hostname}]}]}
|
||||||
- 1
|
- 1
|
||||||
ctlplane_fixed_ip_set:
|
ctlplane_fixed_ip_set:
|
||||||
or:
|
or:
|
||||||
|
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
DeploymentServerBlacklist parameter now supports both
|
||||||
|
heat and actual hostnames.
|
Loading…
Reference in New Issue
Block a user