nagios-charmers team mailing list archive

[Andrea Ieri <andrea.ieri@xxxxxxxxxxxxx>]

Andrea Ieri has proposed merging ~aieri/nagios-charm:bug/1763576 into nagios-charm:master.

Commit message:
When configuring the pagerduty cronjob, prefer juju-*-proxy variables if they are available.

Requested reviews:
  Nagios Charm developers (nagios-charmers)

For more details, see:
https://code.launchpad.net/~aieri/nagios-charm/+git/nagios-charm/+merge/360657
-- 
Your team Nagios Charm developers is requested to review the proposed merge of ~aieri/nagios-charm:bug/1763576 into nagios-charm:master.

diff --git a/hooks/upgrade-charm b/hooks/upgrade-charm
index 8349c36..f9cd034 100755
--- a/hooks/upgrade-charm
+++ b/hooks/upgrade-charm
@@ -115,10 +115,9 @@ def enable_pagerduty_config():
         hookenv.log("Pagerduty is enabled")
         fetch.apt_update()
         fetch.apt_install('libhttp-parser-perl')
-        if 'https_proxy' in os.environ:
-            proxy_switch = '--proxy {}'.format(os.environ['https_proxy'])
-        else:
-            proxy_switch = ''
+        env = os.environ
+        proxy = env.get('JUJU_CHARM_HTTPS_PROXY') or env.get('https_proxy')
+        proxy_switch = '--proxy {}'.format(proxy) if proxy else ''
 
         # Ship the pagerduty_nagios.cfg file
         template_values = {'enable_pagerduty': enable_pagerduty,