the return of reset_connection

allows user to force persistent connection to close, needed for when
you want to benefit from changes applied to the current play but persistent connections
prevent them from being realized.

lib/ansible/plugins/connection/ssh.py

@@ -776,18 +776,16 @@ class Connection(ConnectionBase):
         display.vvv(u"FETCH {0} TO {1}".format(in_path, out_path), host=self.host)
         self._file_transport_command(in_path, out_path, 'get')
 
+    def reset(self):
+        # If we have a persistent ssh connection (ControlPersist), we can ask it to stop listening.
+        cmd = map(to_bytes, self._build_command(self._play_context.ssh_executable, '-O', 'stop', self.host))
+        controlpersist, controlpath = self._persistence_controls(cmd)
+        if controlpersist:
+            p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            stdout, stderr = p.communicate()
+            display.vvv(u'sending stop: %s' % cmd)
+
+        self.close()
+
     def close(self):
-        # If we have a persistent ssh connection (ControlPersist), we can ask it
-        # to stop listening. Otherwise, there's nothing to do here.
-
-        # TODO: reenable once winrm issues are fixed
-        # temporarily disabled as we are forced to currently close connections after every task because of winrm
-        # if self._connected and self._persistent:
-        #     ssh_executable = self._play_context.ssh_executable
-        #     cmd = self._build_command('ssh', '-O', 'stop', self.host)
-        #
-        #     cmd = map(to_bytes, cmd)
-        #     p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        #     stdout, stderr = p.communicate()
-
         self._connected = False

lib/ansible/plugins/strategy/__init__.py

@@ -902,8 +902,10 @@ class StrategyBase:
                     if not host.name in self._tqm._unreachable_hosts:
                         iterator._host_states[host.name].run_state = iterator.ITERATING_COMPLETE
                 msg="ending play"
-        #elif meta_action == 'reset_connection':
-        #    connection_info.connection.close()
+        elif meta_action == 'reset_connection':
+            connection = connection_loader.get(play_context.connection, play_context, '/dev/null')
+            connection.reset()
+            msg= 'reset connection'
         else:
             raise AnsibleError("invalid meta action requested: %s" % meta_action, obj=task._ds)