From: Sage Weil <sage@redhat.com>
Date: Thu, 12 Mar 2020 17:29:14 +0000 (-0500)
Subject: Merge PR #33064 into octopus
X-Git-Tag: v15.1.1~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d1736aeb14ad86c8cb6caf3fdff137356cb13a62;p=ceph.git

Merge PR #33064 into octopus

* refs/pull/33064/head:
	cephadm: add version to `command_ls` output
	cephadm: add type checking to `update_filewalld`
	cephadm: allow prepare-host to start an enabled service
	cephadm: add type checking for `check_host` and `prepare_host`
	cephadm: generalize logic for checking and enabling units
	cephadm: add 'CEPH_CONF' to the NFS ganesha container envs
	cephadm: trim nfs.json sample
	qa/workunits/cephadm/test_cephadm.sh: systemctl stop nfs-server
	qa/workunits/cephadm/test_cephadm.sh: make pgs available
	cephadm: add some log lines
	cephadm: check port in use
	cephadm: add/remove nfs ganesha grace
	cephadm: update firewalld with nfs service
	qa/workunits/cephadm/test_cephadm.sh: add nfs-ganesha test
	cephadm: add ganasha.conf
	cephadm: add NFSGanesha deployment type
	cephadm: consolidate list of supported daemons
	cephadm: use keyword instead of positional args

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

d1736aeb14ad86c8cb6caf3fdff137356cb13a62