Merge "Convert ceph to json"

4 files changed, 3 insertions, 69 deletions

diff --git a/docker/ceph/ceph-mon/config-external.sh b/docker/ceph/ceph-mon/config-external.sh
deleted file mode 100644
index 289cffc86..000000000
--- a/docker/ceph/ceph-mon/config-external.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/ceph-mon/ceph.conf"
-TARGET="/etc/ceph/ceph.conf"
-OWNER="ceph"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
-
-SOURCE="/opt/kolla/ceph-mon/ceph.client.admin.keyring"
-TARGET="/etc/ceph/ceph.client.admin.keyring"
-OWNER="ceph"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0600 $TARGET
-fi
-
-SOURCE="/opt/kolla/ceph-mon/ceph.client.mon.keyring"
-TARGET="/etc/ceph/ceph.client.mon.keyring"
-OWNER="ceph"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0600 $TARGET
-fi
-
-SOURCE="/opt/kolla/ceph-mon/ceph.monmap"
-TARGET="/etc/ceph/ceph.monmap"
-OWNER="ceph"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0600 $TARGET
-fi
diff --git a/docker/ceph/ceph-mon/start.sh b/docker/ceph/ceph-mon/start.sh
index f3eb35a59..29b2bd700 100755
--- a/docker/ceph/ceph-mon/start.sh
+++ b/docker/ceph/ceph-mon/start.sh
@@ -1,9 +1,6 @@
 #!/bin/bash
 set -o errexit
 
-CMD="/usr/bin/ceph-mon"
-ARGS="-d -i $(hostname) --public-addr ${MON_IP}:6789"
-
 # Setup common paths
 KEYRING_ADMIN="/etc/ceph/ceph.client.admin.keyring"
 KEYRING_MON="/etc/ceph/ceph.client.mon.keyring"
@@ -41,4 +38,4 @@ if [[ ! -e "${MON_DIR}/keyring" ]]; then
     rm "${KEYRING_TMP}"
 fi
 
-exec $CMD $ARGS
+exec $CMD
diff --git a/docker/ceph/ceph-osd/config-external.sh b/docker/ceph/ceph-osd/config-external.sh
deleted file mode 100644
index 8928f91cb..000000000
--- a/docker/ceph/ceph-osd/config-external.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/ceph-osd/ceph.conf"
-TARGET="/etc/ceph/ceph.conf"
-OWNER="ceph"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
-
-SOURCE="/opt/kolla/ceph-osd/ceph.client.admin.keyring"
-TARGET="/etc/ceph/ceph.client.admin.keyring"
-OWNER="ceph"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0600 $TARGET
-fi
diff --git a/docker/ceph/ceph-osd/start.sh b/docker/ceph/ceph-osd/start.sh
index 9a27d60cc..4b26c426b 100755
--- a/docker/ceph/ceph-osd/start.sh
+++ b/docker/ceph/ceph-osd/start.sh
@@ -7,11 +7,9 @@ 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
-    JOURNAL_PARTUUID=$(uuidgen)
-
     # Formating disk for ceph
     sgdisk --zap-all -- "${OSD_DEV}"
-    sgdisk --new=2:1M:5G --change-name=2:KOLLA_CEPH_JOURNAL --typecode=2:45B0969E-9B03-4F30-B4C6-B4B80CEFF106 --partition-guid=2:${JOURNAL_PARTUUID} --mbrtogpt -- "${OSD_DEV}"
+    sgdisk --new=2:1M:5G --change-name=2:KOLLA_CEPH_JOURNAL --typecode=2:45B0969E-9B03-4F30-B4C6-B4B80CEFF106 --mbrtogpt -- "${OSD_DEV}"
     sgdisk --largest-new=1 --change-name=1:KOLLA_CEPH_DATA --typecode=1:4FBD7E29-9D25-41B8-AFD0-062C0CEFF05D -- "${OSD_DEV}"
     # This command may throw errors that we can safely ignore
     partprobe || true
@@ -45,7 +43,6 @@ fi
 # We look up the appropriate journal since we cannot rely on symlinks
 JOURNAL_PARTITION=$(ls "${OSD_DEV}"* | egrep "${OSD_DEV}p?2")
 OSD_DIR="/var/lib/ceph/osd/ceph-${OSD_ID}"
-CMD="/usr/bin/ceph-osd"
-ARGS="-f -d -i ${OSD_ID} --osd-journal ${JOURNAL_PARTITION} -k ${OSD_DIR}/keyring"
+ARGS="-i ${OSD_ID} --osd-journal ${JOURNAL_PARTITION} -k ${OSD_DIR}/keyring"
 
 exec $CMD $ARGS