From bcf0770a0479ea23b0f5bed53055c522f481f2e7 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Mon, 15 Apr 2019 16:33:49 -0400 Subject: [PATCH] remove become_plugins ref from backported fix --- changelogs/fragments/no_become_plugins.yml | 2 ++ lib/ansible/plugins/connection/persistent.py | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/no_become_plugins.yml diff --git a/changelogs/fragments/no_become_plugins.yml b/changelogs/fragments/no_become_plugins.yml new file mode 100644 index 00000000000..f308519fd49 --- /dev/null +++ b/changelogs/fragments/no_become_plugins.yml @@ -0,0 +1,2 @@ +bugfixes: + - remove become plugins reference introduced in backport fix diff --git a/lib/ansible/plugins/connection/persistent.py b/lib/ansible/plugins/connection/persistent.py index 10f4d80c3d2..1718c8f97ce 100644 --- a/lib/ansible/plugins/connection/persistent.py +++ b/lib/ansible/plugins/connection/persistent.py @@ -37,7 +37,7 @@ import sys import termios from ansible import constants as C -from ansible.plugins.loader import become_loader, cliconf_loader, connection_loader, httpapi_loader, netconf_loader, terminal_loader +from ansible.plugins.loader import cliconf_loader, connection_loader, httpapi_loader, netconf_loader, terminal_loader from ansible.plugins.connection import ConnectionBase from ansible.module_utils._text import to_text from ansible.module_utils.connection import Connection as SocketConnection, write_to_file_descriptor @@ -96,7 +96,6 @@ class Connection(ConnectionBase): env = os.environ.copy() env.update({ - 'ANSIBLE_BECOME_PLUGINS': become_loader.print_paths(), 'ANSIBLE_CLICONF_PLUGINS': cliconf_loader.print_paths(), 'ANSIBLE_CONNECTION_PLUGINS': connection_loader.print_paths(), 'ANSIBLE_HTTPAPI_PLUGINS': httpapi_loader.print_paths(),