From e2351b49abf37ef09609d722c7261f5e11b4c444 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Tue, 24 Sep 2024 14:06:42 +0200 Subject: [PATCH] qa/suites/rbd/iscsi: enable all supported container hosts On Ubuntu open-iscsi and multipath-tools need to be installed instead of iscsi-initiator-utils and device-mapper-multipath. Signed-off-by: Ilya Dryomov (cherry picked from commit 29e122f8754aa56a2b1cdc56ac4f0591828e5269) Conflicts: - .qa/distros/supported-container-hosts doesn't exist in quincy, replaced with .qa/distros/container-hosts to fix the symlink --- qa/suites/rbd/iscsi/0-single-container-host.yaml | 1 - qa/suites/rbd/iscsi/base/install.yaml | 6 +++++- qa/suites/rbd/iscsi/container-hosts$ | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) delete mode 120000 qa/suites/rbd/iscsi/0-single-container-host.yaml create mode 120000 qa/suites/rbd/iscsi/container-hosts$ diff --git a/qa/suites/rbd/iscsi/0-single-container-host.yaml b/qa/suites/rbd/iscsi/0-single-container-host.yaml deleted file mode 120000 index 7406e749cf565..0000000000000 --- a/qa/suites/rbd/iscsi/0-single-container-host.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/single-container-host.yaml \ No newline at end of file diff --git a/qa/suites/rbd/iscsi/base/install.yaml b/qa/suites/rbd/iscsi/base/install.yaml index 5c5a6c31f60b4..cca178cafe822 100644 --- a/qa/suites/rbd/iscsi/base/install.yaml +++ b/qa/suites/rbd/iscsi/base/install.yaml @@ -9,6 +9,10 @@ tasks: - ceph orch host ls - ceph orch device ls - install: - extra_packages: + extra_system_packages: + deb: + - open-iscsi + - multipath-tools + rpm: - iscsi-initiator-utils - device-mapper-multipath diff --git a/qa/suites/rbd/iscsi/container-hosts$ b/qa/suites/rbd/iscsi/container-hosts$ new file mode 120000 index 0000000000000..be53a48336498 --- /dev/null +++ b/qa/suites/rbd/iscsi/container-hosts$ @@ -0,0 +1 @@ +.qa/distros/container-hosts/ \ No newline at end of file -- 2.39.5