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

Remove 'bastion' as default conf
pull/774/head
Antoine Legrand 2016-12-17 12:42:51 +01:00 committed by GitHub
commit add7570a94
1 changed files with 2 additions and 2 deletions

View File

@ -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