From: Sage Weil <sage@redhat.com>
Date: Tue, 10 Dec 2019 18:16:07 +0000 (-0600)
Subject: Merge PR #32138 into master
X-Git-Tag: v15.1.0~572
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0e981c4c30b63ba11af4af0d00a99f8b90ed57ca;p=ceph.git

Merge PR #32138 into master

* refs/pull/32138/head:
	ceph-daemon: combine SUDO and ARGS into a single var

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

0e981c4c30b63ba11af4af0d00a99f8b90ed57ca
diff --cc qa/standalone/test_ceph_daemon.sh
index 39c77ef4405e,9826ac461c08..2f7e5956b2b7
--- a/qa/standalone/test_ceph_daemon.sh
+++ b/qa/standalone/test_ceph_daemon.sh
@@@ -95,9 -106,9 +102,9 @@@ KEYRING=`mktemp -p $TMPDIR
  IP=127.0.0.1
  cat <<EOF > $ORIG_CONFIG
  [global]
 -log to file = true
 +	log to file = true
  EOF
- $SUDO $CEPH_DAEMON --image $IMAGE_MASTER bootstrap \
+ $CEPH_DAEMON bootstrap \
        --mon-id a \
        --mgr-id x \
        --mon-ip $IP \