openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Simplify ssh known_hosts entries for non-default port" into stable/queens

This commit is contained in:
Zuul 2019-04-04 17:23:30 +00:00 committed by Gerrit Code Review
parent fbba9074af ff5a5bf5a0
commit d2f701264e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -657,14 +657,14 @@ resources:
properties:
value:
str_replace:
template: "PRIMARYIP,[PRIMARYIP]:*,PRIMARYHOST.DOMAIN,[PRIMARYHOST.DOMAIN]:*,PRIMARYHOST,[PRIMARYHOST]:*,\
template: "[PRIMARYIP]*,[PRIMARYHOST.DOMAIN]*,[PRIMARYHOST]*,\
{%- for network in networks %}
{%- if network.enabled|default(true) and network.name in role.networks|default([]) %}
{{network.name}}IP,[{{network.name}}IP]:*,{{network.name}}HOST.DOMAIN,[{{network.name}}HOST.DOMAIN]:*,\
{{network.name}}HOST,[{{network.name}}HOST]:*,\
[{{network.name}}IP]*,[{{network.name}}HOST.DOMAIN]*,\
[{{network.name}}HOST]*,\
{%- endif %}
{%- endfor %}
CTLPLANEIP,[CTLPLANEIP]:*,CTLPLANEHOST.DOMAIN,[CTLPLANEHOST.DOMAIN]:*,CTLPLANEHOST,[CTLPLANEHOST]:*"
[CTLPLANEIP]*,[CTLPLANEHOST.DOMAIN]*,[CTLPLANEHOST]*"
params:
PRIMARYIP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, {{role.name}}HostnameResolveNetwork]}]}
DOMAIN: {get_param: CloudDomain}