Merge pull request #608 from grycap/devel

Devel
grycap · May 15, 2018 · a39721c · a39721c
2 parents 2917531 + 6238bbe
commit a39721c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/IM/connectors/Azure.py b/IM/connectors/Azure.py
@@ -650,7 +650,7 @@ def updateVMInfo(self, vm, auth_data):
             self.log_warn("The VM does not exists.")
             # check if the RG still exists
             if self.get_rg(group_name, credentials, subscription_id):
-                self.log_info("But the RG %s does exits. Retun OFF." % group_name)
+                self.log_info("But the RG %s does exits. Return OFF." % group_name)
                 vm.state = VirtualMachine.OFF
                 return (True, vm)
 

diff --git a/README.md b/README.md
@@ -64,9 +64,9 @@ record_host_keys=False
 [ssh_connection]
 
 # Only in systems with OpenSSH support to ControlPersist
-ssh_args = -o ControlMaster=auto -o ControlPersist=900s -o StrictHostKeyChecking=no
+ssh_args = -o ControlMaster=auto -o ControlPersist=900s -o UserKnownHostsFile=/dev/null
 # In systems with older versions of OpenSSH (RHEL 6, CentOS 6, SLES 10 or SLES 11) 
-#ssh_args = -o StrictHostKeyChecking=no
+#ssh_args = -o UserKnownHostsFile=/dev/null
 pipelining = True
 ```
 

diff --git a/contextualization/conf-ansible.yml b/contextualization/conf-ansible.yml
@@ -157,11 +157,11 @@
       when: (ansible_os_family == "RedHat" and ansible_distribution_major_version|int < 6) or (ansible_os_family == "Suse" and ansible_distribution_major_version|int < 10)
 
     - name: Change ssh_args to set ControlPersist to 15 min in ansible.cfg
-      ini_file: dest=/etc/ansible/ansible.cfg section=ssh_connection option=ssh_args value="-o ControlMaster=auto -o ControlPersist=900s -o StrictHostKeyChecking=no"
+      ini_file: dest=/etc/ansible/ansible.cfg section=ssh_connection option=ssh_args value="-o ControlMaster=auto -o ControlPersist=900s -o UserKnownHostsFile=/dev/null"
       when: ansible_os_family == "Debian" or (ansible_os_family == "RedHat" and ansible_distribution_major_version|int >= 7) or (ansible_os_family == "Suse" and ansible_distribution_major_version|int >= 12)
 
     - name: Change ssh_args to remove ControlPersist in REL 6 and older in ansible.cfg
-      ini_file: dest=/etc/ansible/ansible.cfg section=ssh_connection option=ssh_args value="-o StrictHostKeyChecking=no"
+      ini_file: dest=/etc/ansible/ansible.cfg section=ssh_connection option=ssh_args value="-o UserKnownHostsFile=/dev/null"
       when: (ansible_os_family == "RedHat" and ansible_distribution_major_version|int < 7) or (ansible_os_family == "Suse" and ansible_distribution_major_version|int < 12)
 
     - name: Activate SSH pipelining in ansible.cfg