From eeb791db5322db9ac6b33dc01429d2e4e182f482 Mon Sep 17 00:00:00 2001
From: Marco Silva <marco.silva@canonical.com>
Date: Wed, 6 May 2020 15:25:34 +0100
Subject: [PATCH] Add HA testing for Barbican Vault

Changes to tests to deploy barbican and vault with haclustering.
It now deploys 3 units of vault and barbican, together with hacluster
for both applications.
Overlay added to ensure all tests run in HA.
DocImpact
Closes-Bug: #1876107
Implements: High availability testing

Change-Id: Ia7abdc682fd583e15feba68fc11cdb89ab7c41ff
---
 src/tests/bundles/bionic-rocky.yaml              |  4 ++--
 src/tests/bundles/bionic-stein.yaml              |  4 ++--
 src/tests/bundles/bionic-train.yaml              |  4 ++--
 src/tests/bundles/bionic-ussuri.yaml             |  4 ++--
 src/tests/bundles/focal-ussuri.yaml              | 12 ++++++++++--
 .../bundles/overlays/local-charm-overlay.yaml.j2 | 16 ++++++++++++++++
 6 files changed, 34 insertions(+), 10 deletions(-)
 create mode 100644 src/tests/bundles/overlays/local-charm-overlay.yaml.j2

diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml
index 3e013cd..b591731 100644
--- a/src/tests/bundles/bionic-rocky.yaml
+++ b/src/tests/bundles/bionic-rocky.yaml
@@ -26,7 +26,7 @@ applications:
   barbican:
     series: bionic
     charm: cs:~openstack-charmers-next/barbican
-    num_units: 1
+    num_units: 3
     options:
       openstack-origin: cloud:bionic-rocky
   barbican-vault:
@@ -38,4 +38,4 @@ applications:
     num_units: 1
   vault:
     charm: cs:~openstack-charmers-next/vault
-    num_units: 1
+    num_units: 3
\ No newline at end of file
diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml
index 256c904..87848e1 100644
--- a/src/tests/bundles/bionic-stein.yaml
+++ b/src/tests/bundles/bionic-stein.yaml
@@ -26,7 +26,7 @@ applications:
   barbican:
     series: bionic
     charm: cs:~openstack-charmers-next/barbican
-    num_units: 1
+    num_units: 3
     options:
       openstack-origin: cloud:bionic-stein
   barbican-vault:
@@ -38,4 +38,4 @@ applications:
     num_units: 1
   vault:
     charm: cs:~openstack-charmers-next/vault
-    num_units: 1
+    num_units: 3
\ No newline at end of file
diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml
index d47a672..7dd8e0d 100644
--- a/src/tests/bundles/bionic-train.yaml
+++ b/src/tests/bundles/bionic-train.yaml
@@ -26,7 +26,7 @@ applications:
   barbican:
     series: bionic
     charm: cs:~openstack-charmers-next/barbican
-    num_units: 1
+    num_units: 3
     options:
       openstack-origin: cloud:bionic-train
   barbican-vault:
@@ -38,4 +38,4 @@ applications:
     num_units: 1
   vault:
     charm: cs:~openstack-charmers-next/vault
-    num_units: 1
+    num_units: 3
\ No newline at end of file
diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml
index fcd6ef8..56d0e3a 100644
--- a/src/tests/bundles/bionic-ussuri.yaml
+++ b/src/tests/bundles/bionic-ussuri.yaml
@@ -25,7 +25,7 @@ applications:
       openstack-origin: cloud:bionic-ussuri
   barbican:
     charm: cs:~openstack-charmers-next/barbican
-    num_units: 1
+    num_units: 3
     options:
       openstack-origin: cloud:bionic-ussuri
   barbican-vault:
@@ -36,4 +36,4 @@ applications:
     num_units: 1
   vault:
     charm: cs:~openstack-charmers-next/vault
-    num_units: 1
+    num_units: 3
diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml
index f1e493f..a0943e9 100644
--- a/src/tests/bundles/focal-ussuri.yaml
+++ b/src/tests/bundles/focal-ussuri.yaml
@@ -16,6 +16,10 @@ machines:
   '4':
   '5':
   '6':
+  '7':
+  '8':
+  '9':
+  '10':
 
 applications:
 
@@ -46,11 +50,13 @@ applications:
 
   barbican:
     charm: cs:~openstack-charmers-next/barbican
-    num_units: 1
+    num_units: 3
     options:
       openstack-origin: *openstack-origin
     to:
       - '4'
+      - '9'
+      - '10'
 
   barbican-vault:
     charm: ../../../barbican-vault
@@ -66,9 +72,11 @@ applications:
 
   vault:
     charm: cs:~openstack-charmers-next/vault
-    num_units: 1
+    num_units: 3
     to:
       - '6'
+      - '7'
+      - '8'
 
 relations:
 
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..ae358a5
--- /dev/null
+++ b/src/tests/bundles/overlays/local-charm-overlay.yaml.j2
@@ -0,0 +1,16 @@
+applications:
+  vault:
+    options:
+        vip: '{{ TEST_VIP00 }}'
+  barbican:
+    options:
+        vip: '{{ TEST_VIP01 }}'
+  vault-hacluster:
+    charm: cs:~openstack-charmers-next/hacluster
+  barbican-hacluster:
+    charm: cs:~openstack-charmers-next/hacluster
+relations:
+- - vault:ha
+  - vault-hacluster:ha
+- - barbican:ha
+  - barbican-hacluster:ha
\ No newline at end of file