From dfbfe614c6bee943d82536ea595cc7604c3472b2 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 1 May 2015 11:20:45 +0100 Subject: [PATCH] Osstest/Debian.pm: Use Fqdn hostprop when collecting host keys Otherwise hosts which are not in the same DnsDomain are not processed, resulting in log messages such as: 2015-05-01 10:06:19 Z skipping host key for nonexistent host marilith-n4.xs.citrite.net 2015-05-01 10:06:20 Z skipping host key for nonexistent host lace-bug.xs.citrite.net The practical impact of this appears to be that the pair migration tests can fail with: 2015-05-01 13:18:03 Z executing ssh ... root@10.80.250.26 xl migrate debian.guest.osstest moss-bug Host key verification failed. Signed-off-by: Ian Campbell --- Osstest/Debian.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 69530fb..a577d1d 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -659,7 +659,13 @@ sub preseed_create ($$;@) { END $hostsq->execute($flight); while (my ($node) = $hostsq->fetchrow_array()) { - my $longname= "$node.$c{TestHostDomain}"; + my $defaultfqdn = $node; + $defaultfqdn .= ".$c{TestHostDomain}" unless $defaultfqdn =~ m/\./; + + my %props; + $mhostdb->get_properties($node, \%props); + + my $longname= $props{Fqdn} // $defaultfqdn; my (@hostent)= gethostbyname($longname); if (!@hostent) { logm("skipping host key for nonexistent host $longname"); -- 2.39.5