From b4ac65219ef1f6ded1f0c2c083e45c75335961b5 2015-08-25 23:31:59
From: Branko Majic <branko@majic.rs>
Date: 2015-08-25 23:31:59
Subject: [PATCH] MAR-34: Small usability improvements, not related to original issue. Improved the ssh-keyscan command a bit to include IP addresses in output as well. Store Ansible retry files locally in the retry directory (relative to testsite).

---

diff --git a/.gitignore b/.gitignore
index 383ffccd16e38c35b82d7f646c102dad251e822f..54a1384d5bc19a9903df10619e4d309c0e399d21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@ testsite/preseed_files/
 # host config files for GnuTLS - ca.cfg is versioned, though).
 testsite/tls/*.pem
 testsite/tls/*.key
-testsite/tls/*.*_*.cfg
\ No newline at end of file
+testsite/tls/*.*_*.cfg
+testsite/retry/*
\ No newline at end of file
diff --git a/docs/testsite.rst b/docs/testsite.rst
index dc0ecd1f18a54fad2ba9417af57ef9a6f189a82b..118141214c87a4b96a9860167d3c89a95b7a3ff0 100644
--- a/docs/testsite.rst
+++ b/docs/testsite.rst
@@ -125,7 +125,7 @@ In order to deploy the test site, the following steps would normally be taken:
 
    .. code-block:: shell
 
-      ssh-keyscan mail.example.com ldap.example.com xmpp.example.com web.example.com
+      ssh-keyscan mail.example.com ldap.example.com xmpp.example.com web.example.com $(resolveip -s mail.example.com) $(resolveip -s ldap.example.com) $(resolveip -s xmpp.example.com) $(resolveip -s web.example.com)
 
 9. Invoke the ``bootstrap.yml`` playbook in order to set-up some basic
    environment for Ansible runs on all servers:
diff --git a/testsite/ansible.cfg b/testsite/ansible.cfg
index 33dd42004674301815a2a3187ec1844d54bc689c..9e062508d96eba6f1ee679be93b4d2bc9bb30d7f 100644
--- a/testsite/ansible.cfg
+++ b/testsite/ansible.cfg
@@ -1,4 +1,5 @@
 [defaults]
 
 roles_path=../roles
-force_handlers = True
\ No newline at end of file
+force_handlers = True
+retry_files_save_path = ./retry
\ No newline at end of file