From: Redouane Kachach Date: Tue, 30 May 2023 12:31:15 +0000 (+0200) Subject: cephadm: adding support for ipv6 when deploying ceph-exporter X-Git-Tag: v19.0.0~1027^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=04c6727f4d4b43433f8ca6b2290caddd938fc348;p=ceph.git cephadm: adding support for ipv6 when deploying ceph-exporter Fixes: https://tracker.ceph.com/issues/61499 Signed-off-by: Redouane Kachach --- diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index 672c1701155ea..84f47a56ec244 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -961,7 +961,10 @@ class CephExporter(object): self.image = image self.sock_dir = config_json.get('sock-dir', '/var/run/ceph/') - self.addrs = config_json.get('addrs', socket.gethostbyname(socket.gethostname())) + ipv4_addrs, ipv6_addrs = get_ip_addresses(get_hostname()) + # use the first ipv4 (if any) otherwise use the first ipv6 + addrs = next(iter(ipv4_addrs or ipv6_addrs), None) + self.addrs = config_json.get('addrs', addrs) self.port = config_json.get('port', self.DEFAULT_PORT) self.prio_limit = config_json.get('prio-limit', 5) self.stats_period = config_json.get('stats-period', 5)