From 0c2a15c07ae213b1a0968fe29d9dc4f75a31cef9 Mon Sep 17 00:00:00 2001 From: Simon Michnowicz <simon.michnowicz@monash.edu> Date: Thu, 2 Jun 2016 13:59:38 +1000 Subject: [PATCH] fixed keynames i.e. ansible_host_key_ecdsa_public => ansible_ssh_host_key_ecdsa_public diit for ansible_host_key_rsa_public. Removed superflous check "and hostvars[node]['ansible_host_key_rsa_public'] " --- roles/calculateKnownHosts/templates/known_hosts.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/calculateKnownHosts/templates/known_hosts.j2 b/roles/calculateKnownHosts/templates/known_hosts.j2 index 28d5afcc..09eff179 100644 --- a/roles/calculateKnownHosts/templates/known_hosts.j2 +++ b/roles/calculateKnownHosts/templates/known_hosts.j2 @@ -2,13 +2,13 @@ {% for node in groups['all'] %} {% for interface in hostvars[node]['ansible_interfaces'] %} {% if interface != "lo" %} -{% if 'ansible_host_key_rsa_public' in hostvars[node] and hostvars[node]['ansible_host_key_rsa_public'] %} -{% set host = {'name': node, 'ip': hostvars[node]['ansible_'+interface]['ipv4']['address'], 'keytype':'ssh-rsa', 'key': hostvars[node]['ansible_host_key_rsa_public']} %} +{% if 'ansible_ssh_host_key_rsa_public' in hostvars[node] %} +{% set host = {'name': node, 'ip': hostvars[node]['ansible_'+interface]['ipv4']['address'], 'keytype':'ssh-rsa', 'key': hostvars[node]['ansible_ssh_host_key_rsa_public']} %} {% if nodelist.append(host) %} {% endif %} {% endif %} -{% if 'ansible_host_key_ecdsa_public' in hostvars[node] and hostvars[node]['ansible_host_key_ecdsa_public'] %} -{% set host = {'name': node, 'ip': hostvars[node]['ansible_'+interface]['ipv4']['address'], 'keytype':'ecdsa-sha2-nistp256', 'key': hostvars[node]['ansible_host_key_ecdsa_public']} %} +{% if 'ansible_ssh_host_key_ecdsa_public' in hostvars[node] %} +{% set host = {'name': node, 'ip': hostvars[node]['ansible_'+interface]['ipv4']['address'], 'keytype':'ecdsa-sha2-nistp256', 'key': hostvars[node]['ansible_ssh_host_key_ecdsa_public']} %} {% if nodelist.append(host) %} {% endif %} {% endif %} -- GitLab