bac46cc0e0
This work is part of Debian integration effort. This work only affects debian. We package the same version of ceph for both CentOS and Debian. Since we know the puppet-ceph module on CentOS is supposed to work, use this on Debian also to reduce testing and possible issues. Patches were copied from CentOS and not touched. Drop one patch to metadata.json, we know we have some work to do in that area to clear puppet warnings, but will be done part of a generic clearing puppet warnings effort. The sources need to be patched to work with debhelper-compat 13, which we don't care now. There are some integration issues, but testing so far revealed that during a puppet replay for aio manifest ceph data and ceph journal partitions were created. Story: 2009101 Task: 43431 Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com> Change-Id: I90adc736ea52e6c4f9946520156f53e572c224cc
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From a364f37cacab78cdaad5ebd23ab24cf400a3fa40 Mon Sep 17 00:00:00 2001
|
|
From: Ovidiu Poncea <ovidiu.poncea@windriver.com>
|
|
Date: Thu, 20 Dec 2018 07:18:55 -0500
|
|
Subject: [PATCH] Add StarlingX specific restart command for Ceph monitors
|
|
|
|
Since we don't use systemd to manage Ceph and we have pmon monitoring we
|
|
have to make sure that:
|
|
1. Restarting is properly handled as "systemctl restart" will return error
|
|
and manifest will fail;
|
|
2. Pmon does not check ceph-mon status during restart. Otherwise we risk
|
|
getting into a race condition between the puppet restart and pmon
|
|
detecting that ceph is down and trying a restart.
|
|
|
|
Both are resolved when using /etc/init.d/ceph-init-wrapper restart
|
|
|
|
Signed-off-by: Ovidiu Poncea <Ovidiu.Poncea@windriver.com>
|
|
---
|
|
manifests/mon.pp | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/manifests/mon.pp b/manifests/mon.pp
|
|
index 17cb925..62d5059 100644
|
|
--- a/manifests/mon.pp
|
|
+++ b/manifests/mon.pp
|
|
@@ -106,6 +106,7 @@ define ceph::mon (
|
|
start => "service ceph start mon.${id}",
|
|
stop => "service ceph stop mon.${id}",
|
|
status => "service ceph status mon.${id}",
|
|
+ restart => "/etc/init.d/ceph-init-wrapper restart mon.${id}",
|
|
enable => $mon_enable,
|
|
}
|
|
}
|
|
--
|
|
1.8.3.1
|
|
|