c4f73e3d1e
Historically, we only supported heat hostnames in
DeploymentServerBlacklist and this causes lots of
confusion, specifically when using ephemeral heat.
Let's support both.
Resolved conflicts in: puppet/role.role.j2.yaml
Change-Id: Ifdc0ea99e02743739d6369101eac8476f28c25b8
(cherry picked from commit
|
||
---|---|---|
.. | ||
extraconfig | ||
role.role.j2.yaml |