diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-24 18:44:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-24 18:44:15 +0000 |
| commit | fb5773f1000b5552888ab723843247b8a68dda57 (patch) | |
| tree | e7327682822af99e11921f048a891755ec02d3ed /docker | |
| parent | 989e9da68beb1682deb60478880f370784fe21c8 (diff) | |
| parent | 1e2dfad50be2bf62577515554871b53523499e6e (diff) | |
| download | kolla-fb5773f1000b5552888ab723843247b8a68dda57.tar.gz kolla-fb5773f1000b5552888ab723843247b8a68dda57.zip | |
Merge "Switch ceph to use storage network"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ceph/ceph-mon/extend_start.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/ceph/ceph-mon/extend_start.sh b/docker/ceph/ceph-mon/extend_start.sh index fe8222897..8d43c0e3b 100644 --- a/docker/ceph/ceph-mon/extend_start.sh +++ b/docker/ceph/ceph-mon/extend_start.sh @@ -5,7 +5,7 @@ KEYRING_ADMIN="/etc/ceph/ceph.client.admin.keyring" KEYRING_MON="/etc/ceph/ceph.client.mon.keyring" KEYRING_RGW="/etc/ceph/ceph.client.radosgw.keyring" MONMAP="/etc/ceph/ceph.monmap" -MON_DIR="/var/lib/ceph/mon/ceph-$(hostname -s)" +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. @@ -19,7 +19,7 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then ceph-authtool --create-keyring "${KEYRING_RGW}" --gen-key -n client.radosgw.gateway --set-uid=0 --cap osd 'allow rwx' --cap mon 'allow rwx' ceph-authtool "${KEYRING_MON}" --import-keyring "${KEYRING_ADMIN}" ceph-authtool "${KEYRING_MON}" --import-keyring "${KEYRING_RGW}" - monmaptool --create --add "$(hostname -s)" "${MON_IP}" --fsid "${FSID}" "${MONMAP}" + monmaptool --create --add "${HOSTNAME}" "${MON_IP}" --fsid "${FSID}" "${MONMAP}" exit 0 fi @@ -32,6 +32,6 @@ if [[ ! -e "${MON_DIR}/keyring" ]]; then 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 -s)" --monmap "${MONMAP}" --keyring "${KEYRING_TMP}" + ceph-mon --mkfs -i "${HOSTNAME}" --monmap "${MONMAP}" --keyring "${KEYRING_TMP}" rm "${KEYRING_TMP}" fi |