Skip to content

Commit

Permalink
start_mon: make shellcheck passing
Browse files Browse the repository at this point in the history
This commit add double quotes where it's needed so shellcheck passes on
this file.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit f7a078d)
  • Loading branch information
guits authored and dsavineau committed Apr 15, 2020
1 parent 94d9944 commit 68eb55a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/daemon/start_mon.sh
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,9 @@ function start_mon {
ceph-mon --setuser ceph --setgroup ceph --cluster "${CLUSTER}" -i "${MON_NAME}" --inject-monmap "$MONMAP" --keyring "$MON_KEYRING" --mon-data "$MON_DATA_DIR"
fi
if [[ "$CEPH_DAEMON" != demo ]]; then
v2v1=$(ceph-conf -c /etc/ceph/${CLUSTER}.conf 'mon host' | tr ',' '\n' | grep -c ${MON_IP})
v2v1=$(ceph-conf -c /etc/ceph/"${CLUSTER}".conf 'mon host' | tr ',' '\n' | grep -c "${MON_IP}")
# in case of v2+v1 configuration : [v2:xxxx:3300,v1:xxxx:6789]
if [ ${v2v1} -eq 2 ]; then
if [ "${v2v1}" -eq 2 ]; then
timeout 7 ceph "${CLI_OPTS[@]}" mon add "${MON_NAME}" "${MON_IP}" || true
# with v2 only : [v2:xxxx:3300]
else
Expand Down

0 comments on commit 68eb55a

Please sign in to comment.