From 5fc6d191bfe4ad5cc6dc81bce775b3eadd9123b2 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 8 Nov 2019 16:11:19 -0600 Subject: [PATCH] ceph-daemon: support --mon-addrv for deploy subcommand This maps directly to the public_addrv option. Signed-off-by: Sage Weil --- src/ceph-daemon/ceph-daemon | 6 ++++++ test_ceph_daemon.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ceph-daemon/ceph-daemon b/src/ceph-daemon/ceph-daemon index 12880395985ee..419223be6b91c 100755 --- a/src/ceph-daemon/ceph-daemon +++ b/src/ceph-daemon/ceph-daemon @@ -1158,6 +1158,9 @@ def command_deploy(): if daemon_type == 'mon': if args.mon_ip: config += '[mon.%s]\n\tpublic_addr = %s\n' % (daemon_id, args.mon_ip) + elif args.mon_addrv: + config += '[mon.%s]\n\tpublic_addrv = %s\n' % (daemon_id, + args.mon_addrv) elif args.mon_network: config += '[mon.%s]\n\tpublic_network = %s\n' % (daemon_id, args.mon_network) @@ -1747,6 +1750,9 @@ def _get_parser(): parser_deploy.add_argument( '--mon-ip', help='mon IP') + parser_deploy.add_argument( + '--mon-addrv', + help='mon IPs (e.g., [v2:localipaddr:3300,v1:localipaddr:6789])') parser_deploy.add_argument( '--mon-network', help='mon network (CIDR)') diff --git a/test_ceph_daemon.sh b/test_ceph_daemon.sh index f17793a8b0b15..c74096c8ad1d7 100755 --- a/test_ceph_daemon.sh +++ b/test_ceph_daemon.sh @@ -33,7 +33,7 @@ if [ -n "$ip2" ]; then --image $image \ deploy --name mon.b \ --fsid $fsid \ - --mon-ip $ip2 \ + --mon-addrv "[v2:$ip2:3300,v1:$ip2:6789]" \ --keyring /var/lib/ceph/$fsid/mon.a/keyring \ --config c fi -- 2.39.5