Merge pull request #449 from cdburkard/devel/cluster_controlPaths

use ControlPersist ssh option to fix ControlPath shutdown
2014-11-23 14:59:11 -08:00
parent 474f68600e 34933ef741
commit 596fd9d0c6
1 changed files with 2 additions and 1 deletions
@@ -135,7 +135,8 @@ class RemoteMixin( object ):
            self.sshcmd = [ 'sudo', '-E', '-u', self.user ] + self.sshbase
            if self.controlPath:
                self.sshcmd += [ '-o', 'ControlPath=' + self.controlPath,
-                                 '-o', 'ControlMaster=auto' ]
+                                 '-o', 'ControlMaster=auto',
+                                 '-o', 'ControlPersist=' + '1' ]
            self.sshcmd = self.sshcmd + [ self.dest ]
            self.isRemote = True
        else: