From 4ef7c2504bfb824e13241d7491884dbf4721ec61 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Fri, 8 Nov 2019 16:29:50 -0600
Subject: [PATCH] common/options: add public_addrv

Signed-off-by: Sage Weil <sage@redhat.com>
---
 qa/tasks/mgr/dashboard/test_cluster_configuration.py | 2 +-
 src/common/legacy_config_opts.h                      | 1 +
 src/common/options.cc                                | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/qa/tasks/mgr/dashboard/test_cluster_configuration.py b/qa/tasks/mgr/dashboard/test_cluster_configuration.py
index a4410d4fadf..61d18000a45 100644
--- a/qa/tasks/mgr/dashboard/test_cluster_configuration.py
+++ b/qa/tasks/mgr/dashboard/test_cluster_configuration.py
@@ -343,7 +343,7 @@ class ClusterConfigurationTest(DashboardTestCase):
         self.assertIn('services', data)
         self.assertIn('type', data)
         self.assertIn('desc', data)
-        self.assertIn(data['type'], ['str', 'bool', 'float', 'int', 'size', 'uint', 'addr', 'uuid',
+        self.assertIn(data['type'], ['str', 'bool', 'float', 'int', 'size', 'uint', 'addr', 'addrvec', 'uuid',
                                      'secs'])
 
         if 'value' in data:
diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index 4deed37d3a0..01db8d78ce4 100644
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -15,6 +15,7 @@
 /* note: no header guard */
 OPTION(host, OPT_STR) // "" means that ceph will use short hostname
 OPTION(public_addr, OPT_ADDR)
+OPTION(public_addrv, OPT_ADDRVEC)
 OPTION(public_bind_addr, OPT_ADDR)
 OPTION(cluster_addr, OPT_ADDR)
 OPTION(public_network, OPT_STR)
diff --git a/src/common/options.cc b/src/common/options.cc
index 858feffda2c..666d420a1ec 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -366,6 +366,11 @@ std::vector<Option> get_global_options() {
     .set_flag(Option::FLAG_STARTUP)
     .add_service({"mon", "mds", "osd", "mgr"}),
 
+    Option("public_addrv", Option::TYPE_ADDRVEC, Option::LEVEL_BASIC)
+    .set_description("public-facing address to bind to")
+    .set_flag(Option::FLAG_STARTUP)
+    .add_service({"mon", "mds", "osd", "mgr"}),
+
     Option("public_bind_addr", Option::TYPE_ADDR, Option::LEVEL_ADVANCED)
     .set_default(entity_addr_t())
     .set_flag(Option::FLAG_STARTUP)
-- 
2.39.5