From 36430f4e5ac20206f5693a8f172b53fec0c9d5c3 Mon Sep 17 00:00:00 2001 From: Redouane Kachach Date: Mon, 22 May 2023 11:15:07 +0200 Subject: [PATCH] cephadm: Adding support to configure public_network cfg section Fixes: https://tracker.ceph.com/issues/61330 Signed-off-by: Redouane Kachach (cherry picked from commit 50811d114ec91a3e5e340f6845870597ea498b35) --- src/cephadm/cephadm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 47b245869d8..de7739c6d0d 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -5449,8 +5449,10 @@ def finish_bootstrap_config( cli(['config', 'set', 'global', 'container_image', f'{ctx.image}']) if mon_network: - logger.info(f'Setting mon public_network to {mon_network}') - cli(['config', 'set', 'mon', 'public_network', mon_network]) + cp = read_config(ctx.config) + cfg_section = 'global' if cp.has_option('global', 'public_network') else 'mon' + logger.info(f'Setting public_network to {mon_network} in {cfg_section} config section') + cli(['config', 'set', cfg_section, 'public_network', mon_network]) if cluster_network: logger.info(f'Setting cluster_network to {cluster_network}') -- 2.47.3