cb4e875ae1
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
36 lines
1.5 KiB
Bash
36 lines
1.5 KiB
Bash
#!/bin/bash
|
|
|
|
# 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)"
|
|
|
|
# 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
|