Enable HA for Zaza deployments

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]

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'
 

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'
 

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'
 

src/tests/bundles/overlays/local-charm-overlay.yaml.j2

@@ -0,0 +1,4 @@
+applications:
+  magnum:
+    options:
+      vip: {{ OS_VIP00 }}