From 656f51d8d9885095af5c6bc45a451a727c83edff Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Tue, 7 May 2019 16:43:31 -0500 Subject: [PATCH] Ceph: Dont attempt to reuse monmap if it exists This PS forces the monmap to be clobbered each time the container starts which is required to recover from ome senarios when using an emptydir to back /etc/ceph. Change-Id: I2cf271593591ce07435893336cff98a8b1c72166 Signed-off-by: Pete Birley --- ceph-mon/templates/bin/mon/_start.sh.tpl | 9 --------- 1 file changed, 9 deletions(-) diff --git a/ceph-mon/templates/bin/mon/_start.sh.tpl b/ceph-mon/templates/bin/mon/_start.sh.tpl index 1340d6bc2..c2624d71f 100644 --- a/ceph-mon/templates/bin/mon/_start.sh.tpl +++ b/ceph-mon/templates/bin/mon/_start.sh.tpl @@ -63,15 +63,6 @@ function get_mon_config { exit 1 fi - # if monmap exists and the mon is already there, don't overwrite monmap - if [ -f "${MONMAP}" ]; then - monmaptool --print "${MONMAP}" |grep -q "${MON_IP// }"":${MON_PORT}" - if [ $? -eq 0 ]; then - echo "${MON_IP} already exists in monmap ${MONMAP}" - return - fi - fi - # Create a monmap with the Pod Names and IP monmaptool --create ${MONMAP_ADD} --fsid ${fsid} ${MONMAP} --clobber }