From: Ricardo Dias <rdias@suse.com>
Date: Wed, 20 Nov 2019 10:42:18 +0000 (+0000)
Subject: ceph-mon: keep v1 address type when explicitly set
X-Git-Tag: v14.2.8~28^2~2^2~8^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F32028%2Fhead;p=ceph.git

ceph-mon: keep v1 address type when explicitly set

Fixes: https://tracker.ceph.com/issues/42906

Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit a97893e409050afcedb6e77c06e09d5b8a11b8d0)
---

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index f51dce57e62..2d73294b409 100644
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -194,9 +194,11 @@ entity_addrvec_t make_mon_addrs(entity_addr_t a)
   } else if (a.get_port() == CEPH_MON_PORT_LEGACY) {
     a.set_type(entity_addr_t::TYPE_LEGACY);
     addrs.v.push_back(a);
-  } else {
+  } else if (a.get_type() == entity_addr_t::TYPE_ANY) {
     a.set_type(entity_addr_t::TYPE_MSGR2);
     addrs.v.push_back(a);
+  } else {
+    addrs.v.push_back(a);
   }
   return addrs;
 }