From: Adam King <adking@redhat.com>
Date: Thu, 28 Jan 2021 17:12:57 +0000 (-0500)
Subject: cephadm: fix get_data_dir calls for ha-rgw daemons
X-Git-Tag: v17.1.0~3108^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F39143%2Fhead;p=ceph.git

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 <adking@redhat.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 4739a471e619..ea560d2bddf9 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: