aboutsummaryrefslogtreecommitdiff
path: root/docker/ceph/ceph-mon/start.sh
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-09-30 11:23:39 +0000
committerSam Yaple <sam@yaple.net>2015-10-06 03:30:26 +0000
commitcb4e875ae1e1ec2e6ddf8a6b37f42283697fd50c (patch)
treeda1028203186b45f869828dc5b4d17c13fadea94 /docker/ceph/ceph-mon/start.sh
parent3a56ce182662bcc9cf753024275034907ea36032 (diff)
downloadkolla-cb4e875ae1e1ec2e6ddf8a6b37f42283697fd50c.tar.gz
kolla-cb4e875ae1e1ec2e6ddf8a6b37f42283697fd50c.zip
Common start.sh
The majority of the start.sh code is identical. This removes that duplicate code while still maintaining the ability to call code in a specific container. The start.sh is moved into /usr/local/bin/kolla_start in the container The extend_start.sh script is called by the kolla_start script at the location /usr/local/bin/kolla_extend_start . It always exists because we create a noop kolla_extend_start in the base directory. We override it with extend_start.sh in a specific image should we need to. Of note, the neutron-agents container is exempt from this new structure due to it being a fat container. Additionally, we fix the inconsistent permissions throughout. 644 for repo files and the scripts are set to 755 via a Docker RUN command to ensure someones local perm change won't break upstream containers. Change-Id: I7da8d19965463ad30ee522a71183e3f092e0d6ad Closes-Bug: #1501295
Diffstat (limited to 'docker/ceph/ceph-mon/start.sh')
-rwxr-xr-xdocker/ceph/ceph-mon/start.sh41
1 files changed, 0 insertions, 41 deletions
diff --git a/docker/ceph/ceph-mon/start.sh b/docker/ceph/ceph-mon/start.sh
deleted file mode 100755
index 29b2bd700..000000000
--- a/docker/ceph/ceph-mon/start.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-# Setup common paths
-KEYRING_ADMIN="/etc/ceph/ceph.client.admin.keyring"
-KEYRING_MON="/etc/ceph/ceph.client.mon.keyring"
-MONMAP="/etc/ceph/ceph.monmap"
-MON_DIR="/var/lib/ceph/mon/ceph-$(hostname)"
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
-# of the KOLLA_BOOTSTRAP variable being set, including empty.
-if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
- # Lookup our fsid from the ceph.conf
- FSID=$(awk '/^fsid/ {print $3; exit}' /etc/ceph/ceph.conf)
-
- # Generating initial keyrings and monmap
- ceph-authtool --create-keyring "${KEYRING_MON}" --gen-key -n mon. --cap mon 'allow *'
- ceph-authtool --create-keyring "${KEYRING_ADMIN}" --gen-key -n client.admin --set-uid=0 --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow'
- ceph-authtool "${KEYRING_MON}" --import-keyring "${KEYRING_ADMIN}"
- monmaptool --create --add "$(hostname)" "${MON_IP}" --fsid "${FSID}" "${MONMAP}"
-
- echo "Sleeping until keys are fetched"
- /bin/sleep infinity
-fi
-
-# This section runs on every mon that does not have a keyring already.
-if [[ ! -e "${MON_DIR}/keyring" ]]; then
- KEYRING_TMP="/tmp/ceph.mon.keyring"
-
- # Generate keyring for current monitor
- ceph-authtool --create-keyring "${KEYRING_TMP}" --import-keyring "${KEYRING_ADMIN}"
- ceph-authtool "${KEYRING_TMP}" --import-keyring "${KEYRING_MON}"
- mkdir -p "${MON_DIR}"
- ceph-mon --mkfs -i "$(hostname)" --monmap "${MONMAP}" --keyring "${KEYRING_TMP}"
- rm "${KEYRING_TMP}"
-fi
-
-exec $CMD