From cdd0ba13a5109e4319ffdaff8e8a17212e78dd15 Mon Sep 17 00:00:00 2001 From: Patrick Seidensal Date: Wed, 5 Aug 2020 16:47:13 +0200 Subject: [PATCH] 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 --- src/cephadm/cephadm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index a61a1184cbaa0..cf1880a7edf2e 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -1552,6 +1552,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() @@ -1848,7 +1850,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 -- 2.39.5