livepatch-charmers team mailing list archive

[Barry Price <barry.price@xxxxxxxxxxxxx>]

Barry Price has proposed merging ~barryprice/canonical-livepatch-charm/+git/canonical-livepatch-charm:master into canonical-livepatch-charm:master.

Commit message:
Configure proxies early to avoid race LP#1761661

Requested reviews:
  Livepatch charm developers (livepatch-charmers)
Related bugs:
  Bug #1761661 in Canonical Livepatch Charm: "Race with activating livepatch and configuring proxy"
  https://bugs.launchpad.net/canonical-livepatch-charm/+bug/1761661

For more details, see:
https://code.launchpad.net/~barryprice/canonical-livepatch-charm/+git/canonical-livepatch-charm/+merge/343496
-- 
Your team Livepatch charm developers is requested to review the proposed merge of ~barryprice/canonical-livepatch-charm/+git/canonical-livepatch-charm:master into canonical-livepatch-charm:master.

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')