]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: support quotes around public/cluster network in config passed to bootstrap
authorAdam King <adking@redhat.com>
Fri, 29 Jul 2022 21:26:58 +0000 (17:26 -0400)
committerAdam King <adking@redhat.com>
Wed, 10 Aug 2022 22:58:54 +0000 (18:58 -0400)
Fixes: https://tracker.ceph.com/issues/56973
Signed-off-by: Adam King <adking@redhat.com>
src/cephadm/cephadm

index ba342991e1b0c0d657a4ad6e29f4606dd1d30b1b..5b53464561f90d378abafcc93c3726cf5d9fbdd3 100755 (executable)
@@ -4885,7 +4885,7 @@ def get_public_net_from_cfg(ctx: CephadmContext) -> Optional[str]:
         return None
 
     # Ensure all public CIDR networks are valid
-    public_network = cp.get('global', 'public_network')
+    public_network = cp.get('global', 'public_network').strip('"').strip("'")
     rc, _, err_msg = check_subnet(public_network)
     if rc:
         raise Error(f'Invalid public_network {public_network} parameter: {err_msg}')
@@ -4982,7 +4982,7 @@ def prepare_cluster_network(ctx: CephadmContext) -> Tuple[str, bool]:
     cp = read_config(ctx.config)
     cluster_network = ctx.cluster_network
     if cluster_network is None and cp.has_option('global', 'cluster_network'):
-        cluster_network = cp.get('global', 'cluster_network')
+        cluster_network = cp.get('global', 'cluster_network').strip('"').strip("'")
 
     if cluster_network:
         cluser_nets = set([x.strip() for x in cluster_network.split(',')])