From e52ddc91a3a1da5e8c1f6d24698b18d1263cc6ad Mon Sep 17 00:00:00 2001
From: Ionut Balutoiu <ibalutoiu@cloudbasesolutions.com>
Date: Wed, 10 Mar 2021 10:44:31 +0200
Subject: [PATCH] Enable HA for Zaza deployments

---
 src/templates/ussuri/magnum.conf              |  1 -
 src/tests/bundles/bionic-ussuri.yaml          | 20 ++++++++++++++++---
 src/tests/bundles/focal-ussuri.yaml           | 20 ++++++++++++++++---
 src/tests/bundles/focal-victoria.yaml         | 20 ++++++++++++++++---
 .../overlays/local-charm-overlay.yaml.j2      |  4 ++++
 5 files changed, 55 insertions(+), 10 deletions(-)
 create mode 100644 src/tests/bundles/overlays/local-charm-overlay.yaml.j2

diff --git a/src/templates/ussuri/magnum.conf b/src/templates/ussuri/magnum.conf
index 518975a..4876eab 100644
--- a/src/templates/ussuri/magnum.conf
+++ b/src/templates/ussuri/magnum.conf
@@ -18,7 +18,6 @@ state_path = /var/lib/magnum
 
 
 [api]
-host = {{ options.service_listen_info.magnum_api.ip }}
 port = {{ options.service_listen_info.magnum_api.port }}
 
 [barbican_client]
diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml
index b8bdd28..893a30e 100644
--- a/src/tests/bundles/bionic-ussuri.yaml
+++ b/src/tests/bundles/bionic-ussuri.yaml
@@ -25,6 +25,8 @@ machines:
   '11':
   '12':
   '13':
+  '14':
+  '15':
 
 applications:
 
@@ -120,11 +122,20 @@ applications:
 
   magnum:
     charm: ../../../magnum
-    num_units: 1
+    num_units: 3
     options:
       openstack-origin: *openstack-origin
     to:
       - '11'
+      - '12'
+      - '13'
+
+  magnum-hacluster:
+    charm: cs:~openstack-charmers-next/hacluster
+    num_units: 0
+    options:
+      corosync_transport: unicast
+      cluster_count: 3
 
   heat:
     charm: cs:~openstack-charmers-next/heat
@@ -132,7 +143,7 @@ applications:
     options:
       openstack-origin: *openstack-origin
     to:
-      - '12'
+      - '14'
 
   barbican:
     charm: cs:~openstack-charmers-next/barbican
@@ -140,7 +151,7 @@ applications:
     options:
       openstack-origin: *openstack-origin
     to:
-      - '13'
+      - '15'
 
 relations:
 
@@ -240,6 +251,9 @@ relations:
   - - 'magnum:certificates'
     - 'vault:certificates'
 
+  - - 'magnum:ha'
+    - 'magnum-hacluster:ha'
+
   - - 'heat:amqp'
     - 'rabbitmq-server:amqp'
 
diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml
index addea1c..34f6447 100644
--- a/src/tests/bundles/focal-ussuri.yaml
+++ b/src/tests/bundles/focal-ussuri.yaml
@@ -26,6 +26,8 @@ machines:
   '11':
   '12':
   '13':
+  '14':
+  '15':
 
 applications:
 
@@ -123,11 +125,20 @@ applications:
 
   magnum:
     charm: ../../../magnum
-    num_units: 1
+    num_units: 3
     options:
       openstack-origin: *openstack-origin
     to:
       - '11'
+      - '12'
+      - '13'
+
+  magnum-hacluster:
+    charm: cs:~openstack-charmers-next/hacluster
+    num_units: 0
+    options:
+      corosync_transport: unicast
+      cluster_count: 3
 
   heat:
     charm: cs:~openstack-charmers-next/heat
@@ -135,7 +146,7 @@ applications:
     options:
       openstack-origin: *openstack-origin
     to:
-      - '12'
+      - '14'
 
   barbican:
     charm: cs:~openstack-charmers-next/barbican
@@ -143,7 +154,7 @@ applications:
     options:
       openstack-origin: *openstack-origin
     to:
-      - '13'
+      - '15'
 
 relations:
 
@@ -243,6 +254,9 @@ relations:
   - - 'magnum:certificates'
     - 'vault:certificates'
 
+  - - 'magnum:ha'
+    - 'magnum-hacluster:ha'
+
   - - 'heat:amqp'
     - 'rabbitmq-server:amqp'
 
diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml
index 38573c4..1b069f1 100644
--- a/src/tests/bundles/focal-victoria.yaml
+++ b/src/tests/bundles/focal-victoria.yaml
@@ -26,6 +26,8 @@ machines:
   '11':
   '12':
   '13':
+  '14':
+  '15':
 
 applications:
 
@@ -123,11 +125,20 @@ applications:
 
   magnum:
     charm: ../../../magnum
-    num_units: 1
+    num_units: 3
     options:
       openstack-origin: *openstack-origin
     to:
       - '11'
+      - '12'
+      - '13'
+
+  magnum-hacluster:
+    charm: cs:~openstack-charmers-next/hacluster
+    num_units: 0
+    options:
+      corosync_transport: unicast
+      cluster_count: 3
 
   heat:
     charm: cs:~openstack-charmers-next/heat
@@ -135,7 +146,7 @@ applications:
     options:
       openstack-origin: *openstack-origin
     to:
-      - '12'
+      - '14'
 
   barbican:
     charm: cs:~openstack-charmers-next/barbican
@@ -143,7 +154,7 @@ applications:
     options:
       openstack-origin: *openstack-origin
     to:
-      - '13'
+      - '15'
 
 relations:
 
@@ -243,6 +254,9 @@ relations:
   - - 'magnum:certificates'
     - 'vault:certificates'
 
+  - - 'magnum:ha'
+    - 'magnum-hacluster:ha'
+
   - - 'heat:amqp'
     - 'rabbitmq-server:amqp'
 
diff --git a/src/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/src/tests/bundles/overlays/local-charm-overlay.yaml.j2
new file mode 100644
index 0000000..0fa2798
--- /dev/null
+++ b/src/tests/bundles/overlays/local-charm-overlay.yaml.j2
@@ -0,0 +1,4 @@
+applications:
+  magnum:
+    options:
+      vip: {{ OS_VIP00 }}