From: Patrick Seidensal <pseidensal@suse.com>
Date: Wed, 5 Aug 2020 14:47:13 +0000 (+0200)
Subject: mgr/cephadm: use fixed config file path as argument
X-Git-Tag: v15.2.5~26^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=26af40547fae532613dc54455b48c20240c0dde3;p=ceph.git

mgr/cephadm: use fixed config file path as argument

Fixes other alertmanager containers which do not default to look for a
configuration file in `/etc/alertmanager/alertmanager.yml`.

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit cdd0ba13a5109e4319ffdaff8e8a17212e78dd15)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 829f56bb9e8..d6f85f1ad88 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1544,6 +1544,8 @@ def get_daemon_args(fsid, daemon_type, daemon_id):
             peers = config.get('peers', list())  # type: ignore
             for peer in peers:
                 r += ["--cluster.peer={}".format(peer)]
+            # some alertmanager, by default, look elsewhere for a config
+            r += ["--config.file=/etc/alertmanager/alertmanager.yml"]
     elif daemon_type == NFSGanesha.daemon_type:
         nfs_ganesha = NFSGanesha.init(fsid, daemon_id)
         r += nfs_ganesha.get_daemon_args()
@@ -1840,7 +1842,7 @@ def get_container(fsid, daemon_type, daemon_id,
 
 
 def extract_uid_gid(img='', file_path='/var/lib/ceph'):
-    # type: (str, Union[str, Iterabe[str]]) -> Tuple[int, int]
+    # type: (str, Union[str, List[str]]) -> Tuple[int, int]
 
     if not img:
         img = args.image