]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #32138 into master
authorSage Weil <sage@redhat.com>
Tue, 10 Dec 2019 18:16:07 +0000 (12:16 -0600)
committerSage Weil <sage@redhat.com>
Tue, 10 Dec 2019 18:16:07 +0000 (12:16 -0600)
* 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>
1  2 
qa/standalone/test_ceph_daemon.sh

index 39c77ef4405e70ee40f256b81883b5cd506b4fec,9826ac461c0866c724686dcef82872323a31182b..2f7e5956b2b7475bcbb07ab7b92c018f6739f3f2
@@@ -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 \