adds fix for terminal plugins

This commit is contained in:
Peter Sprygada 2018-03-03 22:54:34 -05:00 committed by Brian Coca
parent 18d605a132
commit 6cbc69447b
2 changed files with 10 additions and 2 deletions

View file

@ -481,7 +481,6 @@ DEFAULT_CLICONF_PLUGIN_PATH:
ini: ini:
- {key: cliconf_plugins, section: defaults} - {key: cliconf_plugins, section: defaults}
type: pathspec type: pathspec
yaml: {key: plugins.connection.path}
DEFAULT_CONNECTION_PLUGIN_PATH: DEFAULT_CONNECTION_PLUGIN_PATH:
name: Connection Plugins Path name: Connection Plugins Path
default: ~/.ansible/plugins/connection:/usr/share/ansible/plugins/connection default: ~/.ansible/plugins/connection:/usr/share/ansible/plugins/connection
@ -1100,6 +1099,14 @@ DEFAULT_TASK_INCLUDES_STATIC:
why: include itself is deprecated and this setting will not matter in the future why: include itself is deprecated and this setting will not matter in the future
version: "2.8" version: "2.8"
alternatives: None, as its already built into the decision between include_tasks and import_tasks alternatives: None, as its already built into the decision between include_tasks and import_tasks
DEFAULT_TERMINAL_PLUGIN_PATH:
name: Terminal Plugins Path
default: ~/.ansible/plugins/terminal:/usr/share/ansible/plugins/terminal
description: Colon separated paths in which Ansible will search for Terminal Plugins.
env: [{name: ANSIBLE_TERMINAL_PLUGINS}]
ini:
- {key: terminal_plugins, section: defaults}
type: pathspec
DEFAULT_TEST_PLUGIN_PATH: DEFAULT_TEST_PLUGIN_PATH:
name: Jinja2 Test Plugins Path name: Jinja2 Test Plugins Path
description: Colon separated paths in which Ansible will search for Jinja2 Test Plugins. description: Colon separated paths in which Ansible will search for Jinja2 Test Plugins.

View file

@ -630,8 +630,9 @@ strategy_loader = PluginLoader(
terminal_loader = PluginLoader( terminal_loader = PluginLoader(
'TerminalModule', 'TerminalModule',
'ansible.plugins.terminal', 'ansible.plugins.terminal',
C.DEFAULT_TERMINAL_PLUGIN_PATH,
'terminal_plugins', 'terminal_plugins',
'terminal_plugins' required_base_class='TerminalBase'
) )
vars_loader = PluginLoader( vars_loader = PluginLoader(