Merge lp:~sajoupa/landscape-charm/op-framework-db-connect-to-primary into lp:~mitchburton/landscape-charm/op-framework

[Laurent Sesquès]

[Laurent Sesquès (sajoupa)]

The current version of the charm fails to deploy in CI and staging with multiple postgresql units, because it can't update the DB schema.
This is because unit_data["host"] can return the IP of any postgresql unit, including the secondary, which is read-only.
This commit will ensure that landscape-server connects to the primary.

[Mitch Burton (mitchburton)]

+1 LGTM

review: Approve

=== modified file 'src/charm.py'
--- src/charm.py	2022-12-06 18:27:20 +0000
+++ src/charm.py	2022-12-30 09:24:16 +0000
@@ -268,10 +268,12 @@
         self._stored.ready["db"] = False
         self.unit.status = MaintenanceStatus("Setting up databases")
 
-        host = unit_data["host"]
+        # We can't use unit_data["host"] because it can return the IP of the secondary
+        master = dict(s.split('=', 1) for s in unit_data["master"])
+        host = master["host"]
+        password = master["password"]
         port = unit_data["port"]
         user = unit_data["user"]
-        password = unit_data["password"]
 
         update_service_conf({
             "stores": {