]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/telemetry: fix proxy usage 38816/head
authorNathan Cutler <ncutler@suse.com>
Fri, 8 Jan 2021 13:25:33 +0000 (14:25 +0100)
committerNathan Cutler <ncutler@suse.com>
Fri, 8 Jan 2021 13:31:12 +0000 (14:31 +0100)
This nautilus-only commit is not cherry-picked from master because it fixes an
incomplete nautilus backport.

Commit

    5d7c79b079827dffdabf78bd18c2930cfed92286
    mgr/telemetry: fix and document proxy usage

targeting master was initially backported to nautilus by

    21b00799948f0863e169d45415fcc5dfb0fac02d

However, this initial backport omitted the "fix" part.

Fixes: 21b00799948f0863e169d45415fcc5dfb0fac02d
Signed-off-by: Nathan Cutler <ncutler@suse.com>
src/pybind/mgr/telemetry/module.py

index 305b59b3a8af1a9dfeee80065c7ea51c6675820e..c21e23407b5bb1e6c20f03c19d08bbbf51b38518 100644 (file)
@@ -694,7 +694,7 @@ class Module(MgrModule):
             proxies['http'] = self.proxy
             proxies['https'] = self.proxy
         try:
-            resp = requests.put(url=url, json=report)
+            resp = requests.put(url=url, json=report, proxies=proxies)
             resp.raise_for_status()
         except Exception as e:
             fail_reason = 'Failed to send %s to %s: %s' % (what, url, str(e))