ceph-daemon: support --mon-addrv for deploy subcommand

This maps directly to the public_addrv option.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/ceph-daemon/ceph-daemon b/src/ceph-daemon/ceph-daemon
index 12880395985eeb71f2afaa221ec917a87fe7c541..419223be6b91c62d0ddb5297770506c6294fc258 100755 (executable)
--- 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 f17793a8b0b15575f115094a1c538502760b0e41..c74096c8ad1d7068e7e992ef4b4c66319853cfe4 100755 (executable)
--- 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