diff options
| author | Sage Weil <sage@redhat.com> | 2019-12-16 22:46:25 +0100 |
|---|---|---|
| committer | Sage Weil <sage@redhat.com> | 2019-12-22 17:50:23 +0100 |
| commit | 40b70c632d22dbd4cf68f8ad0df1b30ee28b9f19 (patch) | |
| tree | 8c0444f1cd45149f0d4a236610be8c9e207eba3b /test_cephadm.sh | |
| parent | cephadm: fix bootstrap message 'ssh' -> 'cephadm' (diff) | |
| download | ceph-40b70c632d22dbd4cf68f8ad0df1b30ee28b9f19.tar.xz ceph-40b70c632d22dbd4cf68f8ad0df1b30ee28b9f19.zip | |
cephadm: move mon creation config bits into mgr/cephadm
There's no need for mgr/cephadm to pass --mon-* arguments to
/usr/bin/cephadm just so it can add bits to the config file when the
config file is also being passed in from mgr/cephadm.
Signed-off-by: Sage Weil <sage@redhat.com>
Diffstat (limited to 'test_cephadm.sh')
| -rwxr-xr-x | test_cephadm.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/test_cephadm.sh b/test_cephadm.sh index ac8763fa898..a9204fc46b6 100755 --- a/test_cephadm.sh +++ b/test_cephadm.sh @@ -43,16 +43,16 @@ $CEPHADM $A \ --allow-overwrite chmod 644 k c -if [ -n "$ip2" ]; then - # mon.b - $CEPHADM $A \ - --image $image \ - deploy --name mon.b \ - --fsid $fsid \ - --mon-addrv "[v2:$ip2:3300,v1:$ip2:6789]" \ - --keyring /var/lib/ceph/$fsid/mon.a/keyring \ - --config c -fi +# mon.b +cp c c.mon +echo "public addrv = [v2:$ip:3301,v1:$ip:6790]" >> c.mon +$CEPHADM $A \ + --image $image \ + deploy --name mon.b \ + --fsid $fsid \ + --keyring /var/lib/ceph/$fsid/mon.a/keyring \ + --config c.mon +rm c.mon # mgr.b bin/ceph -c c -k k auth get-or-create mgr.y \ |