From 1f2c276481ae7052cc70110029436f0b393ef3b9 Mon Sep 17 00:00:00 2001 From: Nathaniel Case Date: Wed, 10 Jan 2018 13:06:47 -0500 Subject: [PATCH] Distinguish between natural connections and rewritten connections (#34706) --- lib/ansible/plugins/action/aireos.py | 2 +- lib/ansible/plugins/action/aruba.py | 2 +- lib/ansible/plugins/action/asa.py | 2 +- lib/ansible/plugins/action/bigip.py | 2 +- lib/ansible/plugins/action/ce.py | 2 +- lib/ansible/plugins/action/dellos10.py | 2 +- lib/ansible/plugins/action/dellos6.py | 2 +- lib/ansible/plugins/action/dellos9.py | 2 +- lib/ansible/plugins/action/enos.py | 2 +- lib/ansible/plugins/action/eos.py | 2 +- lib/ansible/plugins/action/ios.py | 2 +- lib/ansible/plugins/action/iosxr.py | 2 +- lib/ansible/plugins/action/ironware.py | 2 +- lib/ansible/plugins/action/junos.py | 2 +- lib/ansible/plugins/action/net_base.py | 2 +- lib/ansible/plugins/action/nxos.py | 2 +- lib/ansible/plugins/action/sros.py | 2 +- lib/ansible/plugins/action/vyos.py | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/ansible/plugins/action/aireos.py b/lib/ansible/plugins/action/aireos.py index 12aa550714..710eeb842a 100644 --- a/lib/ansible/plugins/action/aireos.py +++ b/lib/ansible/plugins/action/aireos.py @@ -59,7 +59,7 @@ class ActionModule(_ActionModule): pc.password = provider['password'] or self._play_context.password pc.timeout = int(provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT) - display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr) + display.vvv('using connection plugin %s (was local)' % pc.connection, pc.remote_addr) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) socket_path = connection.run() diff --git a/lib/ansible/plugins/action/aruba.py b/lib/ansible/plugins/action/aruba.py index 299df9a879..ea3aabe76a 100644 --- a/lib/ansible/plugins/action/aruba.py +++ b/lib/ansible/plugins/action/aruba.py @@ -59,7 +59,7 @@ class ActionModule(_ActionModule): pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file pc.timeout = int(provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT) - display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr) + display.vvv('using connection plugin %s (was local)' % pc.connection, pc.remote_addr) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) socket_path = connection.run() diff --git a/lib/ansible/plugins/action/asa.py b/lib/ansible/plugins/action/asa.py index 323a01779b..5424a32b7b 100644 --- a/lib/ansible/plugins/action/asa.py +++ b/lib/ansible/plugins/action/asa.py @@ -56,7 +56,7 @@ class ActionModule(_ActionModule): pc.become_pass = provider['auth_pass'] pc.become_method = 'enable' - display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr) + display.vvv('using connection plugin %s (was local)' % pc.connection, pc.remote_addr) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) socket_path = connection.run() diff --git a/lib/ansible/plugins/action/bigip.py b/lib/ansible/plugins/action/bigip.py index 5725193e8a..5176a06138 100644 --- a/lib/ansible/plugins/action/bigip.py +++ b/lib/ansible/plugins/action/bigip.py @@ -55,7 +55,7 @@ class ActionModule(_ActionModule): pc.password = provider.get('password', self._play_context.password) pc.timeout = int(provider.get('timeout', C.PERSISTENT_COMMAND_TIMEOUT)) - display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr) + display.vvv('using connection plugin %s (was local)' % pc.connection, pc.remote_addr) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) socket_path = connection.run() diff --git a/lib/ansible/plugins/action/ce.py b/lib/ansible/plugins/action/ce.py index bf3b1042d2..92c7affb72 100644 --- a/lib/ansible/plugins/action/ce.py +++ b/lib/ansible/plugins/action/ce.py @@ -67,7 +67,7 @@ class ActionModule(_ActionModule): username=pc.remote_user, password=pc.password ) - display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr) + display.vvv('using connection plugin %s (was local)' % pc.connection, pc.remote_addr) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) socket_path = connection.run() diff --git a/lib/ansible/plugins/action/dellos10.py b/lib/ansible/plugins/action/dellos10.py index 35f001f000..2138184cac 100644 --- a/lib/ansible/plugins/action/dellos10.py +++ b/lib/ansible/plugins/action/dellos10.py @@ -63,7 +63,7 @@ class ActionModule(_ActionModule): pc.become = provider['authorize'] or False pc.become_pass = provider['auth_pass'] - display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr) + display.vvv('using connection plugin %s (was local)' % pc.connection, pc.remote_addr) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) socket_path = connection.run() diff --git a/lib/ansible/plugins/action/dellos6.py b/lib/ansible/plugins/action/dellos6.py index e3da8ef35f..81959e44fb 100644 --- a/lib/ansible/plugins/action/dellos6.py +++ b/lib/ansible/plugins/action/dellos6.py @@ -59,7 +59,7 @@ class ActionModule(_ActionModule): pc.become = provider['authorize'] or False pc.become_pass = provider['auth_pass'] - display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr) + display.vvv('using connection plugin %s (was local)' % pc.connection, pc.remote_addr) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) socket_path = connection.run() diff --git a/lib/ansible/plugins/action/dellos9.py b/lib/ansible/plugins/action/dellos9.py index f06dc7023f..7de604b999 100644 --- a/lib/ansible/plugins/action/dellos9.py +++ b/lib/ansible/plugins/action/dellos9.py @@ -63,7 +63,7 @@ class ActionModule(_ActionModule): pc.become = provider['authorize'] or False pc.become_pass = provider['auth_pass'] - display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr) + display.vvv('using connection plugin %s (was local)' % pc.connection, pc.remote_addr) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) socket_path = connection.run() diff --git a/lib/ansible/plugins/action/enos.py b/lib/ansible/plugins/action/enos.py index 1f1693cd7b..40480f14ed 100644 --- a/lib/ansible/plugins/action/enos.py +++ b/lib/ansible/plugins/action/enos.py @@ -72,7 +72,7 @@ class ActionModule(_ActionModule): pc.become_pass = provider['auth_pass'] pc.become_method = 'enable' - display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr) + display.vvv('using connection plugin %s (was local)' % pc.connection, pc.remote_addr) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) socket_path = connection.run() display.vvvv('socket_path: %s' % socket_path, pc.remote_addr) diff --git a/lib/ansible/plugins/action/eos.py b/lib/ansible/plugins/action/eos.py index af33036036..aa980044d9 100644 --- a/lib/ansible/plugins/action/eos.py +++ b/lib/ansible/plugins/action/eos.py @@ -66,7 +66,7 @@ class ActionModule(_ActionModule): pc.become_method = 'enable' pc.become_pass = provider['auth_pass'] - display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr) + display.vvv('using connection plugin %s (was local)' % pc.connection, pc.remote_addr) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) socket_path = connection.run() diff --git a/lib/ansible/plugins/action/ios.py b/lib/ansible/plugins/action/ios.py index 8486e9c9c6..f8060b175e 100644 --- a/lib/ansible/plugins/action/ios.py +++ b/lib/ansible/plugins/action/ios.py @@ -61,7 +61,7 @@ class ActionModule(_ActionModule): pc.become_method = 'enable' pc.become_pass = provider['auth_pass'] - display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr) + display.vvv('using connection plugin %s (was local)' % pc.connection, pc.remote_addr) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) socket_path = connection.run() diff --git a/lib/ansible/plugins/action/iosxr.py b/lib/ansible/plugins/action/iosxr.py index 89f4e085d9..3fed63f5e7 100644 --- a/lib/ansible/plugins/action/iosxr.py +++ b/lib/ansible/plugins/action/iosxr.py @@ -62,7 +62,7 @@ class ActionModule(_ActionModule): pc.password = provider['password'] or self._play_context.password pc.timeout = int(provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT) - display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr) + display.vvv('using connection plugin %s (was local)' % pc.connection, pc.remote_addr) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) socket_path = connection.run() diff --git a/lib/ansible/plugins/action/ironware.py b/lib/ansible/plugins/action/ironware.py index 3a8029d8d9..fa8da417bb 100644 --- a/lib/ansible/plugins/action/ironware.py +++ b/lib/ansible/plugins/action/ironware.py @@ -64,7 +64,7 @@ class ActionModule(_ActionModule): pc.become_method = 'enable' pc.become_pass = provider['auth_pass'] - display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr) + display.vvv('using connection plugin %s (was local)' % pc.connection, pc.remote_addr) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) socket_path = connection.run() diff --git a/lib/ansible/plugins/action/junos.py b/lib/ansible/plugins/action/junos.py index 63c1568054..86ac4eae36 100644 --- a/lib/ansible/plugins/action/junos.py +++ b/lib/ansible/plugins/action/junos.py @@ -64,7 +64,7 @@ class ActionModule(_ActionModule): pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file pc.timeout = int(provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT) - display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr) + display.vvv('using connection plugin %s (was local)' % pc.connection, pc.remote_addr) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) socket_path = connection.run() diff --git a/lib/ansible/plugins/action/net_base.py b/lib/ansible/plugins/action/net_base.py index 22ccf4bc82..45c5891076 100644 --- a/lib/ansible/plugins/action/net_base.py +++ b/lib/ansible/plugins/action/net_base.py @@ -129,7 +129,7 @@ class ActionModule(ActionBase): def _start_connection(self, play_context): - display.vvv('using connection plugin %s' % play_context.connection, play_context.remote_addr) + display.vvv('using connection plugin %s (was local)' % play_context.connection, play_context.remote_addr) connection = self._shared_loader_obj.connection_loader.get('persistent', play_context, sys.stdin) diff --git a/lib/ansible/plugins/action/nxos.py b/lib/ansible/plugins/action/nxos.py index ee8f7b3e84..874cde018b 100644 --- a/lib/ansible/plugins/action/nxos.py +++ b/lib/ansible/plugins/action/nxos.py @@ -62,7 +62,7 @@ class ActionModule(_ActionModule): pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file pc.timeout = int(provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT) - display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr) + display.vvv('using connection plugin %s (was local)' % pc.connection, pc.remote_addr) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) socket_path = connection.run() diff --git a/lib/ansible/plugins/action/sros.py b/lib/ansible/plugins/action/sros.py index 8a1e745d98..a2e3ecadc3 100644 --- a/lib/ansible/plugins/action/sros.py +++ b/lib/ansible/plugins/action/sros.py @@ -51,7 +51,7 @@ class ActionModule(_ActionModule): pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file pc.timeout = int(provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT) - display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr) + display.vvv('using connection plugin %s (was local)' % pc.connection, pc.remote_addr) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) socket_path = connection.run() diff --git a/lib/ansible/plugins/action/vyos.py b/lib/ansible/plugins/action/vyos.py index d64456c755..74414b8eb5 100644 --- a/lib/ansible/plugins/action/vyos.py +++ b/lib/ansible/plugins/action/vyos.py @@ -57,7 +57,7 @@ class ActionModule(_ActionModule): pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file pc.timeout = int(provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT) - display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr) + display.vvv('using connection plugin %s (was local)' % pc.connection, pc.remote_addr) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) socket_path = connection.run()