Merge "Remove ssh_retry plugin."

playbooks/ansible.cfg

@@ -17,13 +17,6 @@ nocolor = 0
 # SSH timeout
 timeout = 120
 
-# ssh_retry connection plugin
-connection_plugins = plugins/connection_plugins
-transport = ssh_retry
-
-# [ssh_retry]
-# retries = 3
-
 [ssh_connection]
 pipelining = True
 ssh_args = -o ControlMaster=auto -o ControlPersist=60s -o TCPKeepAlive=yes -o ServerAliveInterval=5 -o ServerAliveCountMax=3

playbooks/plugins/connection_plugins/ssh_retry.py

@@ -1,71 +0,0 @@
-# (c) 2012, Michael DeHaan <michael.dehaan@gmail.com>
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-import time
-
-import ansible.constants as C
-from ansible.callbacks import vvv, display
-from ansible.runner.connection_plugins import ssh as base_ssh
-
-
-class Connection(base_ssh.Connection):
-    '''SSH connections with retries on failure'''
-
-    def exec_command(self, *args, **kwargs):
-        """ Wrapper around _exec_command to retry in the case of an ssh
-            failure
-
-            Will retry if:
-            * an exception is caught
-            * ssh returns 255
-
-            Will not retry if
-            * remaining_tries is <2
-            * retries limit reached
-            """
-        remaining_tries = C.get_config(
-            C.p, 'ssh_retry', 'retries',
-            'ANSIBLE_SSH_RETRY_RETRIES', 3, integer=True) + 1
-        cmd_summary = "%s %s..." % (args[0], str(kwargs)[:200])
-        for attempt in xrange(remaining_tries):
-            pause = 2 ** attempt - 1
-            if pause > 30:
-                pause = 30
-            time.sleep(pause)
-            try:
-                return_tuple = super(Connection, self).exec_command(*args,
-                                                                    **kwargs)
-            except Exception as e:
-                msg = ("ssh_retry: attempt: %d, caught exception(%s) from cmd "
-                       "(%s).") % (attempt, e, cmd_summary)
-                display(msg, color='blue')
-                if attempt == remaining_tries - 1:
-                    raise e
-                else:
-                    continue
-            # 0 = success
-            # 1-254 = remote command return code
-            # 255 = failure from the ssh command itself
-            if return_tuple[0] != 255:
-                break
-            else:
-                msg = ('ssh_retry: attempt: %d, ssh return code is 255. cmd '
-                       '(%s).') % (attempt, cmd_summary)
-                display(msg, color='blue')
-
-        return return_tuple