From 07f9fc11eeb6f31c4179cfa7bc77c67b66db4ef8 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Thu, 7 Mar 2019 05:45:48 +0000
Subject: [PATCH] Add multisite testing

Add bundles for testing of multisite configurations
for OpenStack Queens and Rocky.

Change-Id: I8bbd3977f13709422d3c2c7086d285b5736cb883
---
 tests/bundles/bionic-queens-multisite.yaml | 75 ++++++++++++++++++++++
 tests/bundles/bionic-rocky-multisite.yaml  | 75 ++++++++++++++++++++++
 tests/tests.yaml                           |  8 ++-
 3 files changed, 155 insertions(+), 3 deletions(-)
 create mode 100644 tests/bundles/bionic-queens-multisite.yaml
 create mode 100644 tests/bundles/bionic-rocky-multisite.yaml

diff --git a/tests/bundles/bionic-queens-multisite.yaml b/tests/bundles/bionic-queens-multisite.yaml
new file mode 100644
index 00000000..8cb411ad
--- /dev/null
+++ b/tests/bundles/bionic-queens-multisite.yaml
@@ -0,0 +1,75 @@
+options:
+  source: &source distro
+series: bionic
+applications:
+  ceph-radosgw:
+    series: bionic
+    charm: ../../../ceph-radosgw
+    num_units: 1
+    options:
+      source: *source
+      realm: testrealm
+      zonegroup: testzonegroup
+      zone: east-1
+      region: east-1
+  east-ceph-osd:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 3
+    storage:
+      osd-devices: 'cinder,10G'
+    options:
+      source: *source
+  east-ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      source: *source
+  slave-ceph-radosgw:
+    series: bionic
+    charm: ../../../ceph-radosgw
+    num_units: 1
+    options:
+      source: *source
+      realm: testrealm
+      zonegroup: testzonegroup
+      zone: west-1
+      region: west-1
+  west-ceph-osd:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 3
+    storage:
+      osd-devices: 'cinder,10G'
+    options:
+      source: *source
+  west-ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      source: *source
+  percona-cluster:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+  keystone:
+    expose: True
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *source
+      region: "east-1 west-1"
+relations:
+- - keystone:shared-db
+  - percona-cluster:shared-db
+- - east-ceph-osd:mon
+  - east-ceph-mon:osd
+- - ceph-radosgw:mon
+  - east-ceph-mon:radosgw
+- - ceph-radosgw:identity-service
+  - keystone:identity-service
+- - west-ceph-osd:mon
+  - west-ceph-mon:osd
+- - slave-ceph-radosgw:mon
+  - west-ceph-mon:radosgw
+- - slave-ceph-radosgw:identity-service
+  - keystone:identity-service
+- - slave-ceph-radosgw:master
+  - ceph-radosgw:slave
diff --git a/tests/bundles/bionic-rocky-multisite.yaml b/tests/bundles/bionic-rocky-multisite.yaml
new file mode 100644
index 00000000..75e7eadb
--- /dev/null
+++ b/tests/bundles/bionic-rocky-multisite.yaml
@@ -0,0 +1,75 @@
+options:
+  source: &source cloud:bionic-rocky
+series: bionic
+applications:
+  ceph-radosgw:
+    series: bionic
+    charm: ../../../ceph-radosgw
+    num_units: 1
+    options:
+      source: *source
+      realm: testrealm
+      zonegroup: testzonegroup
+      zone: east-1
+      region: east-1
+  east-ceph-osd:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 3
+    storage:
+      osd-devices: 'cinder,10G'
+    options:
+      source: *source
+  east-ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      source: *source
+  slave-ceph-radosgw:
+    series: bionic
+    charm: ../../../ceph-radosgw
+    num_units: 1
+    options:
+      source: *source
+      realm: testrealm
+      zonegroup: testzonegroup
+      zone: west-1
+      region: west-1
+  west-ceph-osd:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 3
+    storage:
+      osd-devices: 'cinder,10G'
+    options:
+      source: *source
+  west-ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      source: *source
+  percona-cluster:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+  keystone:
+    expose: True
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *source
+      region: "east-1 west-1"
+relations:
+- - keystone:shared-db
+  - percona-cluster:shared-db
+- - east-ceph-osd:mon
+  - east-ceph-mon:osd
+- - ceph-radosgw:mon
+  - east-ceph-mon:radosgw
+- - ceph-radosgw:identity-service
+  - keystone:identity-service
+- - west-ceph-osd:mon
+  - west-ceph-mon:osd
+- - slave-ceph-radosgw:mon
+  - west-ceph-mon:radosgw
+- - slave-ceph-radosgw:identity-service
+  - keystone:identity-service
+- - slave-ceph-radosgw:master
+  - ceph-radosgw:slave
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 8231399e..a8ed3404 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -7,10 +7,12 @@ gate_bundles:
   - xenial-pike
   - xenial-queens
   - bionic-queens
-smoke_bundles:
-  - bionic-queens
-dev_bundles:
+  - bionic-queens-multisite
   - bionic-rocky
+  - bionic-rocky-multisite
+smoke_bundles:
+  - bionic-rocky
+dev_bundles:
   - cosmic-rocky
 tests:
   - zaza.charm_tests.ceph.tests.CephRGWTest