Merge pull request #770 from kubernetes-incubator/ant31-patch-2

Remove 'bastion' as default conf
2016-12-17 12:42:51 +01:00 · 2016-12-17 12:42:51 +01:00 · add7570a94
parent 768fe05eea db77bd9588
commit add7570a94
1 changed files with 2 additions and 2 deletions
--- a/ansible.cfg
+++ b/ansible.cfg
@ -1,7 +1,7 @@
 [ssh_connection]
 pipelining=True
-ssh_args = -F ./ssh-bastion.conf -o ControlMaster=auto -o ControlPersist=30m
-control_path = ~/.ssh/ansible-%%r@%%h:%%p
+#ssh_args = -F ./ssh-bastion.conf -o ControlMaster=auto -o ControlPersist=30m
+#control_path = ~/.ssh/ansible-%%r@%%h:%%p
 [defaults]
 host_key_checking=False
 gathering = smart