MB-15438: moxi and cbcollect_info should not use a proxy.

Change-Id: I54a3be250c3dd7e0413098d9bff2ae0200fa92f2 Reviewed-on: http://review.couchbase.org/52492 Reviewed-by: Aliaksey Artamonau <aliaksiej.artamonau@gmail.com> Tested-by: Aliaksey Artamonau <aliaksiej.artamonau@gmail.com>
membase · Jun 29, 2015 · a2b827a · a2b827a
1 parent 2da2e8e
commit a2b827a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/cbcollect_info b/cbcollect_info
@@ -476,11 +476,11 @@ def make_product_task(guts, initargs_path, options):
                  log_file="ini.log"),
 
         AllOsTask("couchbase diags",
-                  ["curl", "-sS",
+                  ["curl", "-sS", "--proxy", "",
                    "-u", '%s:%s' % ("@", read_guts(guts, "memcached_pass")),
                    diag_url],
                   log_file="diag.log",
-                  command_to_print="curl -sS -u %s:***** %s" % (read_guts(guts, "rest_user"), diag_url)),
+                  command_to_print="curl -sS --proxy '' -u %s:***** %s" % (read_guts(guts, "rest_user"), diag_url)),
 
         [AllOsTask("couchbase logs (%s)" % name, "cbbrowse_logs %s" % name,
                    addenv = [("REPORT_DIR", read_guts(guts, "log_path"))],

diff --git a/src/ns_ports_setup.erl b/src/ns_ports_setup.erl
@@ -242,7 +242,8 @@ do_per_bucket_moxi_specs(Config) ->
                                                    ""),
                       Opts = [use_stdio, stderr_to_stdout,
                               {env, [{"MOXI_SASL_PLAIN_USR", BucketName},
-                                     {"MOXI_SASL_PLAIN_PWD", Passwd}]}],
+                                     {"MOXI_SASL_PLAIN_PWD", Passwd},
+                                     {"http_proxy", ""}]}],
                       [{{moxi, BucketName}, Command, Args, Opts}|Acc]
               end
       end, [], BucketConfigs).
@@ -515,7 +516,8 @@ do_moxi_spec(Config) ->
             ],
             [{env, [{"EVENT_NOSELECT", "1"},
                     {"MOXI_SASL_PLAIN_USR", {"~s", [{ns_moxi_sup, rest_user, []}]}},
-                    {"MOXI_SASL_PLAIN_PWD", {"~s", [{ns_moxi_sup, rest_pass, []}]}}
+                    {"MOXI_SASL_PLAIN_PWD", {"~s", [{ns_moxi_sup, rest_pass, []}]}},
+                    {"http_proxy", ""}
                    ]},
              use_stdio, exit_status,
              stderr_to_stdout,