From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Mon, 18 Jan 2021 11:33:36 +0000 (+0100)
Subject: cephadm: Fix node-exporter deployment.
X-Git-Tag: v17.0.0~25^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6f7e01ee89b582b02cab141b9f5c08215c4c8d47;p=ceph.git

cephadm: Fix node-exporter deployment.

Fixes: 2ce828d5f3682d3eee61e4a4a07a9eedb6a3d04e
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 7c95e08e0e319..b392b014ecd1b 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1937,6 +1937,7 @@ def create_daemon_dirs(fsid, daemon_type, daemon_id, uid, gid,
 
         # Set up directories specific to the monitoring component
         config_dir = ''
+        data_dir_root = ''
         if daemon_type == 'prometheus':
             data_dir_root = get_data_dir(fsid, daemon_type, daemon_id)
             config_dir = 'etc/prometheus'
@@ -1955,8 +1956,6 @@ def create_daemon_dirs(fsid, daemon_type, daemon_id, uid, gid,
             config_dir = 'etc/alertmanager'
             makedirs(os.path.join(data_dir_root, config_dir), uid, gid, 0o755)
             makedirs(os.path.join(data_dir_root, config_dir, 'data'), uid, gid, 0o755)
-        else:
-            assert False
 
         # populate the config directory for the component from the config-json
         for fname in required_files: