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 <idryomov@gmail.com>
(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

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 (symlink)
index 7406e74..0000000
--- 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 5c5a6c31f60b437f6feedc2aec90398918aa942a..cca178cafe822721caf3770a969235917eb87984 100644 (file)
--- 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 (symlink)
index 0000000..be53a48
--- /dev/null
+++ b/qa/suites/rbd/iscsi/container-hosts$
@@ -0,0 +1 @@
+.qa/distros/container-hosts/
\ No newline at end of file