From: Sage Weil <sage@redhat.com>
Date: Tue, 1 Oct 2019 15:10:39 +0000 (-0500)
Subject: ceph-daemon: allow --mon-network for deploying new mon (vs specifying IP)
X-Git-Tag: v15.1.0~1313^2~45
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e2dbba46269aeb96ff6cb6e13b1a14968c620e3a;p=ceph.git

ceph-daemon: allow --mon-network for deploying new mon (vs specifying IP)

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

diff --git a/src/ceph-daemon b/src/ceph-daemon
index a18aedbd65ef..b575db456bd1 100755
--- a/src/ceph-daemon
+++ b/src/ceph-daemon
@@ -644,8 +644,11 @@ 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_network:
+            config += '[mon.%s]\n\tpublic_network = %s\n' % (daemon_id,
+                                                             args.mon_network)
         else:
-            raise RuntimeError('must specify --mon-ip')
+            raise RuntimeError('must specify --mon-ip or --mon-network')
     (uid, gid) = extract_uid_gid()
     c = get_container(args.fsid, daemon_type, daemon_id)
     deploy_daemon(args.fsid, daemon_type, daemon_id, c, uid, gid,
@@ -979,6 +982,9 @@ parser_deploy.add_argument(
 parser_deploy.add_argument(
     '--mon-ip',
     help='mon IP')
+parser_deploy.add_argument(
+    '--mon-network',
+    help='mon network (CIDR)')
 parser_deploy.add_argument(
     '--osd-fsid',
     help='OSD uuid, if creating an OSD container')