qa/cephadm: fix iscsi deployment in upgrade tests

Signed-off-by: Adam King <adking@redhat.com>

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 5f9677d684330c3b86519fb198efceb358791d0c..bb9a220e69864dcb168896e56f8d816b9ff18b70 100644 (file)
--- 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 475cdaa5d28a173b0aee20eb2ff544fad8dc9b38..d3d9de83eb15073e3cb48ad4299723502f78757c 100644 (file)
--- 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 111e0274a1c5a9542cd4787f6debed6c8c66856e..70fe3f444f9916dc47af58e335f12c1c5558816b 100644 (file)
--- 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 109ccb9dbecd5824eb8ee837bbc776a1f69fb1eb..46ec56f03e7b98c223cadc9da37818e62ba525fd 100644 (file)
--- 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