RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-04 02:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #36943 from sebastian-philipp/cephadm-add-comments-to-secondary-containers

Browse Source 
mgr/cephadm: Add comments to secondary contaieners

Reviewed-by: Matthew Oliver <moliver@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
This commit is contained in:
Sebastian Wagner 2020-09-03 14:42:53 +02:00 committed by GitHub
commit 40d0d231f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cephadm/cephadm
View File

@ -2014,7 +2014,7 @@ def deploy_daemon_units(fsid, uid, gid, daemon_type, daemon_id, c,
# add nfs to the rados grace db
nfs_ganesha = NFSGanesha.init(fsid, daemon_id)
prestart = nfs_ganesha.get_rados_grace_container('add')
_write_container_cmd_to_bash(f, prestart)
_write_container_cmd_to_bash(f, prestart, 'add daemon to rados grace')
elif daemon_type == CephIscsi.daemon_type:
f.write(' '.join(CephIscsi.configfs_mount_umount(data_dir, mount=True)) + '\n')
ceph_iscsi = CephIscsi.init(fsid, daemon_id)
@ -2047,12 +2047,12 @@ def deploy_daemon_units(fsid, uid, gid, daemon_type, daemon_id, c,
cname='ceph-%s-%s.%s-deactivate' % (fsid, daemon_type,
daemon_id),
)
_write_container_cmd_to_bash(f, poststop)
_write_container_cmd_to_bash(f, poststop, 'deactivate osd')
elif daemon_type == NFSGanesha.daemon_type:
# remove nfs from the rados grace db
nfs_ganesha = NFSGanesha.init(fsid, daemon_id)
poststop = nfs_ganesha.get_rados_grace_container('remove')
_write_container_cmd_to_bash(f, poststop)
_write_container_cmd_to_bash(f, poststop, 'remove daemon from rados grace')
elif daemon_type == CephIscsi.daemon_type:
# make sure we also stop the tcmu container
ceph_iscsi = CephIscsi.init(fsid, daemon_id)