From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Tue, 7 Apr 2020 21:49:06 +0000 (+0200)
Subject: Merge pull request #34053 from matthewoliver/iscsi-cephadm
X-Git-Tag: v16.1.0~2676
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aeb601bd375745d2a8f0e62709f7b9a43d1d1bf1;p=ceph.git

Merge pull request #34053 from matthewoliver/iscsi-cephadm

cephadm: Add ceph-iscsi

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

aeb601bd375745d2a8f0e62709f7b9a43d1d1bf1
diff --cc src/cephadm/cephadm
index 577afd0fc4eb,872fabbaf8c0..984786295b41
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@@ -1651,11 -1788,9 +1788,13 @@@ def deploy_daemon_units(fsid, uid, gid
              nfs_ganesha = NFSGanesha.init(fsid, daemon_id)
              prestart = nfs_ganesha.get_rados_grace_container('add')
              f.write(' '.join(prestart.run_cmd()) + '\n')
+         elif daemon_type == CephIscsi.daemon_type:
+             f.write(' '.join(CephIscsi.configfs_mount_umount(data_dir, mount=True)) + '\n')
  
 +        if daemon_type in Ceph.daemons:
 +            install_path = find_program('install')
 +            f.write('{install_path} -d -m0770 -o {uid} -g {gid} /var/run/ceph/{fsid}\n'.format(install_path=install_path, fsid=fsid, uid=uid, gid=gid))
 +
          # container run command
          f.write(' '.join(c.run_cmd()) + '\n')
          os.fchmod(f.fileno(), 0o600)