Merge lp:~simpoir/landscape-charm/1501803_ha_amqp into lp:~landscape/landscape-charm/trunk

[Simon Poirier]

Add all units to broker section with HA rabbitmq.

Add all units to broker section with HA rabbitmq.

Testing instructions:

juju bootstrap localhost
make bundles-local-charm
juju deploy ./bundles/build/landscape-scalable/bundle.yaml
juju add-unit rabbitmq-server
# wait for units to settle
juju run --unit landscape-server/0 -- cat /etc/landscape/service.conf|grep -n3 broker

[Maximiliano Bertacchini (maxiberta)]

+1 works with updated charms (https://code.launchpad.net/~simpoir/landscape-bundles/bumpitty-bump/+merge/406125)

review: Approve

=== modified file 'lib/tests/test_templates.py'
--- lib/tests/test_templates.py	2021-04-13 19:03:22 +0000
+++ lib/tests/test_templates.py	2021-07-21 22:39:31 +0000
@@ -240,6 +240,32 @@
             "/etc/landscape/gpg-passphrase.txt",
             config.get("api", "gpg-passphrase-path"))
 
+    def test_broker_ha(self):
+        """
+        Verify that broker gets a list of multiple rabbit servers if
+        multiple such units exist.
+        """
+        self.context["amqp"] = [
+            {
+                "hostname": "roger",
+                "password": "secret",
+            },
+            {
+                "hostname": "bugs",
+                "password": "secret",
+            },
+            {
+                "hostname": "lola",
+                "password": "secret",
+            },
+        ]
+
+        buffer = StringIO(self.template.render(self.context))
+        config = ConfigParser()
+        config.readfp(buffer)
+        self.assertEqual("roger,bugs,lola", config.get("broker", "host"))
+        self.assertEqual("secret", config.get("broker", "password"))
+
 
 class LandscapeDefaultsTest(TemplateTest):
 
 
=== modified file 'templates/service.conf'
--- templates/service.conf	2021-04-16 19:21:23 +0000
+++ templates/service.conf	2021-07-21 22:39:31 +0000
@@ -24,9 +24,9 @@
 
 [broker]
 port = 5672
-host = {{ rabbitmq["hostname"] }}
+host = {{ amqp|join(",", attribute="hostname") }}
 user = landscape
-password = {{ rabbitmq["password"] }}
+password = {{ amqp[0]["password"] }}
 vhost = landscape
 
 [schema]