From 035bdc34a6dd7144fe6d4005b5ac798fb73ac65a Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Tue, 12 Nov 2019 19:26:52 +0000 Subject: [PATCH] Revert "Fix ssh_known_hosts hostname entries" This reverts commit 84dd53a386cdc75816131a80683481a4307aa39d. This appears to have broken ovb. 2019-11-12 17:28:30 | The error appears to be in '/usr/share/ansible/roles/tripleo-ssh-known-hosts/tasks/main.yml': line 46, column 7 Change-Id: I5ae0efba8338cfcc3e43588ebea89238aabc7c82 --- .../notes/fix_ssh-known-hosts-2520b9d6f67458b7.yaml | 10 ---------- .../roles/tripleo-ssh-known-hosts/tasks/main.yml | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 releasenotes/notes/fix_ssh-known-hosts-2520b9d6f67458b7.yaml diff --git a/releasenotes/notes/fix_ssh-known-hosts-2520b9d6f67458b7.yaml b/releasenotes/notes/fix_ssh-known-hosts-2520b9d6f67458b7.yaml deleted file mode 100644 index 68cef23b7..000000000 --- a/releasenotes/notes/fix_ssh-known-hosts-2520b9d6f67458b7.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -fixes: - - | - Previously the tripleo-ssh-known-hosts ansible role used the list of - network names to create the different possible hostnames in the - ssh_known_hosts file. The network names do not match the actual network - hostnames, like internal_api vs. internalapi which results in ssh host - verification to fail and e.g. live migration to fail. - This changes to use the _hostname inventory information to be used to add - hostname information to the ssh_known_hosts file. diff --git a/tripleo_ansible/roles/tripleo-ssh-known-hosts/tasks/main.yml b/tripleo_ansible/roles/tripleo-ssh-known-hosts/tasks/main.yml index dcb1d9f72..27c6713e5 100644 --- a/tripleo_ansible/roles/tripleo-ssh-known-hosts/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo-ssh-known-hosts/tasks/main.yml @@ -52,8 +52,8 @@ {%- if enabled_networks | length > 0 and role_networks and role_networks | length > 0 %}, {%- for network in enabled_networks %} {%- if network in role_networks %} - [{{ hostvars[host][networks[network]['name'] ~ '_ip'] }}]*,[{{ host }}.{{ networks[network]['name'] | replace("_", "") }}]*,{% if 1 %}{% endif %} - [{{ hostvars[host][networks[network]['name'] ~ '_hostname'] }}]*{% if not loop.last %},{% endif %} + [{{ hostvars[host][networks[network]['name'] ~ '_ip'] }}]*,[{{ host }}.{{ networks[network]['name'] }}]*,{% if 1 %}{% endif %} + [{{ host }}.{{ networks[network]['name'] }}.{{ cloud_domain }}]*{% if not loop.last %},{% endif %} {%- endif -%} {%- endfor -%} {%- endif -%}