Merge ~barryprice/charm-canonical-livepatch/+git/canonical-livepatch-charm:master into ~livepatch-charmers/charm-canonical-livepatch:master

[Barry Price]

Configure proxies early to avoid race LP#1761661

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Stuart Bishop (stub)]

Yup.

Are we at the point we want to deprecate this option in favour of the snap proxy? I guess we should want until dogfooding and beta is over.

review: Approve

[Haw Loeung (hloeung)]

LGTM as well.

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 0da2937fa16abad4ba11eb9df75ef29a09e62a84

diff --git a/reactive/canonical_livepatch.py b/reactive/canonical_livepatch.py
index e176c45..f71923d 100644
--- a/reactive/canonical_livepatch.py
+++ b/reactive/canonical_livepatch.py
@@ -207,6 +207,11 @@ def canonical_livepatch_connect():
         unit_update('blocked', 'A reboot is required')
     else:
         unit_update('maintenance', 'Connecting to the livepatch service')
+        # Configure proxies early, if required - LP#1761661
+        config = hookenv.config()
+        proxy_url = config.get('livepatch_proxy')
+        if proxy_url:
+            configure_proxies(http_proxy=proxy_url, https_proxy=proxy_url)
         # Make sure the service is ready for us
         wait_for_livepatch()
         set_state('canonical-livepatch.connected')