From 1318e668d0107f3f48f1700d905ee6934d73998e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 7 Oct 2019 16:48:19 -0500 Subject: [PATCH] test_ceph_daemon: default to test on 127.0.0.1; accept ip as arg Signed-off-by: Sage Weil --- test_ceph_daemon.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test_ceph_daemon.sh b/test_ceph_daemon.sh index 4695dca134c..331ebcfa473 100755 --- a/test_ceph_daemon.sh +++ b/test_ceph_daemon.sh @@ -2,6 +2,7 @@ fsid=2a833e3f-53e4-49a7-a7a0-bd89d193ab62 image=ceph/daemon-base:latest-master-devel +[ -z "$ip" ] && ip=127.0.0.1 ../src/ceph-daemon rm-cluster --fsid $fsid --force @@ -16,21 +17,23 @@ EOF --mon-id a \ --mgr-id x \ --fsid $fsid \ - --mon-ip 10.3.64.23 \ + --mon-ip $ip \ --config c \ --output-keyring k \ --output-config c \ --skip-ssh chmod 644 k c -# mon.b -../src/ceph-daemon \ +if [ -n "$ip2" ]; then + # mon.b + ../src/ceph-daemon \ --image $image \ deploy --name mon.b \ --fsid $fsid \ - --mon-ip 10.3.64.27 \ + --mon-ip $ip2 \ --keyring /var/lib/ceph/$fsid/mon.a/keyring \ --config c +fi # mgr.b bin/ceph -c c -k k auth get-or-create mgr.y \