From af0d73ea384aad8bdd306fc2e1c0a29dfa5fb9e3 Mon Sep 17 00:00:00 2001 From: SamYaple Date: Sun, 17 Jan 2016 23:19:34 +0000 Subject: Rename ceph-mon bootstrap container to avoid conflict Ceph-mon bootstrap container shares the same name of `ceph_mon` with real ceph-mon service. When bootstrapping, it will sleep forever for the purpose of distribute rings. Later on, when starting real `ceph_mon` service, kolla_docker module will take bootstrap container as real one because bootstrap container has a super set of env variables and kolla_docker doesn't do strict comparing of env variable items. This change follows the pattern of other bootstrap containers and rename to use `bootstrap_ceph_mon` to avoid conflict. Co-Authored-By: Sam Yaple Change-Id: I0082820900928c42f9cc778ffd705980fea9ad1c Closes-Bug: #1535140 --- docker/ceph/ceph-mon/extend_start.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'docker/ceph') diff --git a/docker/ceph/ceph-mon/extend_start.sh b/docker/ceph/ceph-mon/extend_start.sh index 3b8246e37..fd17de511 100644 --- a/docker/ceph/ceph-mon/extend_start.sh +++ b/docker/ceph/ceph-mon/extend_start.sh @@ -21,8 +21,7 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then ceph-authtool "${KEYRING_MON}" --import-keyring "${KEYRING_RGW}" monmaptool --create --add "$(hostname)" "${MON_IP}" --fsid "${FSID}" "${MONMAP}" - echo "Sleeping until keys are fetched" - /bin/sleep infinity + exit 0 fi # This section runs on every mon that does not have a keyring already. -- cgit v1.2.3