From: mh <mh@immerda.ch>
Date: Tue, 30 May 2017 16:25:29 +0000 (+0200)
Subject: keep port as part of the control path
X-Git-Tag: v2.3.0rc2~31^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=64b7b88fb76231a32f6f789be36261ab20b36508;p=ceph-ansible.git

keep port as part of the control path

On a Vagrant setup, every host is 127.0.0.1 and every user is vagrant.
To not have ansible do the same stuff on the same machine (the one
we connected first), we should keep the port as part of the
control path.

Also this helps in setups where different hosts might be hidden
behind the same IP, but on different ports (e.g. using DNAT).
---

diff --git a/ansible.cfg b/ansible.cfg
index 87f54df0a..9b0afd7f4 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -10,4 +10,4 @@ log_path = /var/log/ansible.log
 
 [ssh_connection]
 # see: https://github.com/ansible/ansible/issues/11536
-control_path = %(directory)s/%%h-%%r
+control_path = %(directory)s/%%h-%%r-%%p