From 10214317aee39ecca5e7744b2ee7f528a4b80cb5 Mon Sep 17 00:00:00 2001 From: Adam King Date: Thu, 28 Jan 2021 12:12:57 -0500 Subject: [PATCH] cephadm: fix get_data_dir calls for ha-rgw daemons calls need to use the context's data dir rather than daemon type puts these calls in line with the other daemons Signed-off-by: Adam King --- src/cephadm/cephadm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 4739a471e61..ea560d2bddf 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -2302,7 +2302,7 @@ def get_container_mounts(ctx, fsid, daemon_type, daemon_id, if daemon_type == HAproxy.daemon_type: assert daemon_id - data_dir = get_data_dir(fsid, daemon_type, daemon_type, daemon_id) + data_dir = get_data_dir(fsid, ctx.data_dir, daemon_type, daemon_id) mounts.update(HAproxy.get_container_mounts(data_dir)) if daemon_type == CephIscsi.daemon_type: @@ -2313,7 +2313,7 @@ def get_container_mounts(ctx, fsid, daemon_type, daemon_id, if daemon_type == Keepalived.daemon_type: assert daemon_id - data_dir = get_data_dir(fsid, daemon_type, daemon_type, daemon_id) + data_dir = get_data_dir(fsid, ctx.data_dir, daemon_type, daemon_id) mounts.update(Keepalived.get_container_mounts(data_dir)) if daemon_type == CustomContainer.daemon_type: -- 2.39.5