]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: Remove duplicated process args in promtail and loki(config.file) 47654/head
authorjinhong.kim <jinhong.kim0@navercorp.com>
Wed, 10 Aug 2022 08:24:22 +0000 (17:24 +0900)
committerAdam King <adking@redhat.com>
Wed, 17 Aug 2022 17:24:20 +0000 (13:24 -0400)
Signed-off-by: jinhong.kim <jinhong.kim0@navercorp.com>
(cherry picked from commit 6141d207cb0ab8a3928363d8c8e27fae8149082a)

src/cephadm/cephadm

index 3d540f4edd35cf9e5f555a16a5bec0f9b07b6a2f..e620ae7bff038de5ca66e223e9ab4e68322165f4 100755 (executable)
@@ -2604,10 +2604,8 @@ def get_daemon_args(ctx, fsid, daemon_type, daemon_id):
                 r += ['--cluster.peer={}'.format(peer)]
             # some alertmanager, by default, look elsewhere for a config
             r += ['--config.file=/etc/alertmanager/alertmanager.yml']
-        if daemon_type == 'loki':
-            r += ['--config.file=/etc/loki/loki.yml']
         if daemon_type == 'promtail':
-            r += ['--config.file=/etc/promtail/promtail.yml']
+            r += ['--config.expand-env']
         if daemon_type == 'node-exporter':
             r += ['--path.procfs=/host/proc',
                   '--path.sysfs=/host/sys',