openstack/tripleo-heat-templates
Code Issues Proposed changes

Simplify ssh known_hosts entries for non-default port

Browse Source 
'[host]*' matches both default port and non-default port.

Change-Id: Id83bed36f3ab7f8d0fbdbd03f3960307af62fc84
Related-bug: #1789452
This commit is contained in:
Oliver Walsh 2018-08-30 12:23:45 +01:00
parent 876683f317
commit c70d197d36
1 changed files with 4 additions and 4 deletions

8
puppet/role.role.j2.yaml

@ -761,12 +761,12 @@ resources:
properties:
value:
str_replace:
template: "PRIMARYIP,[PRIMARYIP]:*,PRIMARYHOST.DOMAIN,[PRIMARYHOST.DOMAIN]:*,PRIMARYHOST,[PRIMARYHOST]:*,\
template: "[PRIMARYIP]*,[PRIMARYHOST.DOMAIN]*,[PRIMARYHOST]*,\
{%- for network in networks %}
{{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]*,\
{%- 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}