From: Ilya Dryomov <idryomov@gmail.com>
Date: Wed, 25 Sep 2024 07:53:35 +0000 (+0200)
Subject: qa/tasks/ceph_iscsi_client: don't use mpathconf
X-Git-Tag: v20.0.0~923^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9022ef19a58155620b3626080ea58b3c60b6fa36;p=ceph.git

qa/tasks/ceph_iscsi_client: don't use mpathconf

... since it's not available on Ubuntu.  In this case mpathconf just
sets a couple of default values and defines an empty blacklist section,
so it's easy enough to replicate.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---

diff --git a/qa/tasks/ceph_iscsi_client.py b/qa/tasks/ceph_iscsi_client.py
index 189b7fa31fef8..0b0a355f925f5 100644
--- a/qa/tasks/ceph_iscsi_client.py
+++ b/qa/tasks/ceph_iscsi_client.py
@@ -31,8 +31,15 @@ def task(ctx, config):
         remote.run(args=['sudo', 'systemctl', 'restart', 'iscsid'])
 
         remote.run(args=['sudo', 'modprobe', 'dm_multipath'])
-        remote.run(args=['sudo', 'mpathconf', '--enable'])
         conf = dedent('''
+        defaults {
+                user_friendly_names yes
+                find_multipaths yes
+        }
+
+        blacklist {
+        }
+
         devices {
                 device {
                         vendor                 "LIO-ORG"
@@ -50,7 +57,7 @@ def task(ctx, config):
         }
         ''')
         path = "/etc/multipath.conf"
-        remote.sudo_write_file(path, conf, append=True)
+        remote.sudo_write_file(path, conf)
         remote.run(args=['sudo', 'systemctl', 'start', 'multipathd'])
 
     yield