From 6af56b7ddd622b8f5c0b01fbd89b6f026063c87f Mon Sep 17 00:00:00 2001 From: Ionut Balutoiu Date: Thu, 11 Feb 2021 15:53:51 +0000 Subject: [PATCH] Add Ceph RGW backend testing Enable multi-backend for the bundles with Ceph deployed. The extra backend enabled is an object store, that uses the OpenStack Swift compatible API provided by the Ceph RGW. Func-Test-Pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/505 Change-Id: I7125fbd4d188b2da3227ab8288a8aed3a61ef143 --- tests/bundles/focal-ussuri.yaml | 16 ++++++++++++++++ tests/bundles/focal-victoria.yaml | 16 ++++++++++++++++ tests/bundles/groovy-victoria.yaml | 16 ++++++++++++++++ tests/tests.yaml | 1 + 4 files changed, 49 insertions(+) diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml index 122becd1..cc1b734d 100644 --- a/tests/bundles/focal-ussuri.yaml +++ b/tests/bundles/focal-ussuri.yaml @@ -24,6 +24,7 @@ machines: '12': '13': '14': + '15': applications: @@ -57,6 +58,14 @@ applications: - '7' - '8' + ceph-radosgw: + charm: cs:~openstack-charmers-next/ceph-radosgw + num_units: 1 + options: + source: *openstack-origin + to: + - '15' + ceph-mon: charm: cs:~openstack-charmers-next/ceph-mon num_units: 3 @@ -120,3 +129,10 @@ relations: - - 'ceph-osd:mon' - 'ceph-mon:osd' + + - - 'ceph-radosgw:mon' + - 'ceph-mon:radosgw' + - - 'ceph-radosgw:identity-service' + - 'keystone:identity-service' + - - 'ceph-radosgw:object-store' + - 'glance:object-store' diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml index 33dfc752..dd3d8943 100644 --- a/tests/bundles/focal-victoria.yaml +++ b/tests/bundles/focal-victoria.yaml @@ -24,6 +24,7 @@ machines: '12': '13': '14': + '15': applications: @@ -57,6 +58,14 @@ applications: - '7' - '8' + ceph-radosgw: + charm: cs:~openstack-charmers-next/ceph-radosgw + num_units: 1 + options: + source: *openstack-origin + to: + - '15' + ceph-mon: charm: cs:~openstack-charmers-next/ceph-mon num_units: 3 @@ -120,3 +129,10 @@ relations: - - 'ceph-osd:mon' - 'ceph-mon:osd' + + - - 'ceph-radosgw:mon' + - 'ceph-mon:radosgw' + - - 'ceph-radosgw:identity-service' + - 'keystone:identity-service' + - - 'ceph-radosgw:object-store' + - 'glance:object-store' diff --git a/tests/bundles/groovy-victoria.yaml b/tests/bundles/groovy-victoria.yaml index 8bd96d8f..fb565e27 100644 --- a/tests/bundles/groovy-victoria.yaml +++ b/tests/bundles/groovy-victoria.yaml @@ -24,6 +24,7 @@ machines: '12': '13': '14': + '15': applications: @@ -57,6 +58,14 @@ applications: - '7' - '8' + ceph-radosgw: + charm: cs:~openstack-charmers-next/ceph-radosgw + num_units: 1 + options: + source: *openstack-origin + to: + - '15' + ceph-mon: charm: cs:~openstack-charmers-next/ceph-mon num_units: 3 @@ -120,3 +129,10 @@ relations: - - 'ceph-osd:mon' - 'ceph-mon:osd' + + - - 'ceph-radosgw:mon' + - 'ceph-mon:radosgw' + - - 'ceph-radosgw:identity-service' + - 'keystone:identity-service' + - - 'ceph-radosgw:object-store' + - 'glance:object-store' diff --git a/tests/tests.yaml b/tests/tests.yaml index ed34e24f..37f056d8 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -37,6 +37,7 @@ configure: tests: - ceph: - zaza.openstack.charm_tests.glance.tests.GlanceTest + - zaza.openstack.charm_tests.glance.tests.GlanceCephRGWBackendTest - zaza.openstack.charm_tests.policyd.tests.GlanceTests - zaza.openstack.charm_tests.ceph.tests.CheckPoolTypes - zaza.openstack.charm_tests.ceph.tests.BlueStoreCompressionCharmOperation