From 2dda2599c4881440f518cc2fcd5b0837ea901f83 Mon Sep 17 00:00:00 2001 From: Adam King Date: Mon, 10 Oct 2022 13:49:51 -0400 Subject: [PATCH] qa/cephadm: fix iscsi deployment in upgrade tests Signed-off-by: Adam King --- .../1-start-centos_8.stream_container-tools.yaml | 1 - .../cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml | 1 - qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml | 5 +++++ qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml index 5f9677d68433..bb9a220e6986 100644 --- a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml +++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml @@ -37,4 +37,3 @@ roles: - prometheus.a - grafana.a - node-exporter.b - - ceph.iscsi.iscsi.a diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml index 475cdaa5d28a..d3d9de83eb15 100644 --- a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml +++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml @@ -31,4 +31,3 @@ roles: - prometheus.a - grafana.a - node-exporter.b - - ceph.iscsi.iscsi.a diff --git a/qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml b/qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml index 111e0274a1c5..70fe3f444f99 100644 --- a/qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml +++ b/qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml @@ -2,11 +2,16 @@ tasks: - cephadm.shell: env: [sha1] mon.a: + # setup rgw - radosgw-admin realm create --rgw-realm=r --default - radosgw-admin zonegroup create --rgw-zonegroup=default --master --default - radosgw-admin zone create --rgw-zonegroup=default --rgw-zone=z --master --default - radosgw-admin period update --rgw-realm=r --commit - ceph orch apply rgw foo --realm r --zone z --placement=2 --port=8000 + # setup iscsi + - ceph osd pool create foo + - rbd pool init foo + - ceph orch apply iscsi foo u p - sleep 120 - ceph config set mon mon_warn_on_insecure_global_id_reclaim false --force - ceph config set mon mon_warn_on_insecure_global_id_reclaim_allowed false --force diff --git a/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml b/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml index 109ccb9dbecd..46ec56f03e7b 100644 --- a/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml +++ b/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml @@ -2,11 +2,16 @@ tasks: - cephadm.shell: env: [sha1] mon.a: + # setup rgw - radosgw-admin realm create --rgw-realm=r --default - radosgw-admin zonegroup create --rgw-zonegroup=default --master --default - radosgw-admin zone create --rgw-zonegroup=default --rgw-zone=z --master --default - radosgw-admin period update --rgw-realm=r --commit - ceph orch apply rgw foo --realm r --zone z --placement=2 --port=8000 + # setup iscsi + - ceph osd pool create foo + - rbd pool init foo + - ceph orch apply iscsi foo u p - sleep 180 - ceph config set mon mon_warn_on_insecure_global_id_reclaim false --force - ceph config set mon mon_warn_on_insecure_global_id_reclaim_allowed false --force -- 2.47.3