Merge lp:~hloeung/ubuntu-repository-cache/use-correct-updated-unit-ip-address into lp:ubuntu-repository-cache

[Haw Loeung]

Use correct/updated IP address of unit - LP:1876029

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

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

[Barry Price (barryprice)]

LGTM +1

review: Approve

[lp:~hloeung/ubuntu-repository-cache/use-correct-updated-unit-ip-address]

291. By Haw Loeung on 2020-12-03

Update relation data on both config-changed and leader-settings-changed hooks to ensure it's run on start/restart

292. By Haw Loeung on 2020-12-03

Also run on cluster-relation-changed

[Barry Price (barryprice)]

Yup

review: Approve

[Stuart Bishop (stub)]

Sure.

review: Approve

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

Change successfully merged at revision 290

=== modified file 'reactive/ubuntu-repository-cache.py'
--- reactive/ubuntu-repository-cache.py	2020-10-06 10:04:18 +0000
+++ reactive/ubuntu-repository-cache.py	2020-12-03 04:57:58 +0000
@@ -44,6 +44,7 @@
 @reactive.when_not('ubuntu-repository-cache.configured')
 def configure_services():
     service.render_configs()
+    update_website_relation_data()
 
     # We should always do this anyway, but currently,
     # due to LP#1626318, following a reboot, the ephemeral
@@ -56,6 +57,20 @@
     reactive.set_flag('ubuntu-repository-cache.configured')
 
 
+def update_website_relation_data():
+    relation_id = None
+    for relid in hookenv.relation_ids('website'):
+        relation_id = relid
+    if not relation_id:
+        return
+
+    # LP:1876029: Work around Juju not updating 'private-address'
+    primary_address = hookenv.network_get_primary_address('website')
+    LOG('Updating relation with primary IP address: {}'.format(primary_address))
+    settings = {'private-address': primary_address, 'hostname': primary_address, 'port': 80}
+    hookenv.relation_set(relation_id=relation_id, relation_settings=settings)
+
+
 @reactive.hook('upgrade-charm')
 def upgrade_charm():
     '''Handle charm updates'''
@@ -141,6 +156,7 @@
     _fix_ssh_ownership(user='www-sync')
     mirror.peer_update_metadata()
     service.render_configs()
+    update_website_relation_data()
 
 
 @reactive.hook('cluster-relation-departed')
@@ -213,6 +229,7 @@
     LOG('leader-settings-changed fired. New leader_id: {}'.format(leader_id))
     mirror.peer_update_metadata()
     service.render_configs()
+    update_website_relation_data()
 
 
 # LP:1770071: Work around charm-helper's unison ownership