From 32d4a8811c446d1606bdfe82b1ba18de00f90216 Mon Sep 17 00:00:00 2001 From: "Thierno IB. BARRY" Date: Fri, 29 Jan 2016 14:07:13 +0100 Subject: [PATCH] Elasticsearch: Add proxy support Add proxy support for plugin installation. --- .../modules/extras/packaging/elasticsearch_plugin.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/ansible/modules/extras/packaging/elasticsearch_plugin.py b/lib/ansible/modules/extras/packaging/elasticsearch_plugin.py index f1053144e12..d7a20a503b2 100644 --- a/lib/ansible/modules/extras/packaging/elasticsearch_plugin.py +++ b/lib/ansible/modules/extras/packaging/elasticsearch_plugin.py @@ -124,16 +124,20 @@ def main(): timeout=dict(default="1m"), plugin_bin=dict(default="/usr/share/elasticsearch/bin/plugin"), plugin_dir=dict(default="/usr/share/elasticsearch/plugins/"), + proxy_host=dict(default=None), + proxy_port=dict(default=None), version=dict(default=None) ) ) - plugin_bin = module.params["plugin_bin"] - plugin_dir = module.params["plugin_dir"] name = module.params["name"] state = module.params["state"] url = module.params["url"] timeout = module.params["timeout"] + plugin_bin = module.params["plugin_bin"] + plugin_dir = module.params["plugin_dir"] + proxy_host = module.params["proxy_host"] + proxy_port = module.params["proxy_port"] version = module.params["version"] present = is_plugin_present(parse_plugin_repo(name), plugin_dir) @@ -147,6 +151,9 @@ def main(): cmd_args = [plugin_bin, package_state_map[state], name] + if proxy_host and proxy_port: + cmd_args.append("-DproxyHost=%s -DproxyPort=%s" % proxy_host, proxy_port) + if url: cmd_args.append("--url %s" % url)