From: John Spray <john.spray@redhat.com>
Date: Thu, 13 Jul 2017 12:24:31 +0000 (-0400)
Subject: common: revert public_addr setting to a string
X-Git-Tag: v12.1.2~192^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a3054ef0d9db191f8c13be936330f569bf209385;p=ceph.git

common: revert public_addr setting to a string

This was a string in the old schema, and tests
depended on that -- if we want to change its type
let's do that separately to the infrastructure changes.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/common/options.cc b/src/common/options.cc
index e5540b6717a3..4ee2ff2d0228 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -105,14 +105,12 @@ const std::vector<Option> ceph_options = {
   .add_service("osd")
   .add_tag("network"),
 
-  Option("public_network", Option::TYPE_ADDR, Option::LEVEL_ADVANCED)
-  .set_default("")
+  Option("public_network", Option::TYPE_STR, Option::LEVEL_ADVANCED)
   .add_service("mon mds osd mgr")
   .add_tag("network")
   .set_description(""),
 
   Option("cluster_network", Option::TYPE_STR, Option::LEVEL_ADVANCED)
-  .set_default("")
   .add_service("osd")
   .add_tag("network")
   .set_description(""),