[Xen-devel] [PATCH OSSTEST RFC] Osstest/Debian.pm: Use Fqdn hostprop when collecting host keys

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

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@xxxxxxxxxxxx xl migrate 
debian.guest.osstest moss-bug
Host key verification failed.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 Osstest/Debian.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 69530fb..b6c5844 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -659,7 +659,9 @@ sub preseed_create ($$;@) {
 END
     $hostsq->execute($flight);
     while (my ($node) = $hostsq->fetchrow_array()) {
-        my $longname= "$node.$c{TestHostDomain}";
+        my %props;
+        $mhostdb->get_properties($node, \%props);
+        my $longname= $props{Fqdn} ? $props{Fqdn} : "$node.$c{TestHostDomain}";
         my (@hostent)= gethostbyname($longname);
         if (!@hostent) {
             logm("skipping host key for nonexistent host $longname");
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel