Skip to content

Commit

Permalink
Revert "demo: fetch initial keys"
Browse files Browse the repository at this point in the history
This reverts commit 246e622.

This function is useless as we use the admin key for demo.
  • Loading branch information
Erwan Velu committed Nov 23, 2018
1 parent eeba8e7 commit 9d6da0c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 15 deletions.
2 changes: 1 addition & 1 deletion src/daemon/config.static.sh
Expand Up @@ -76,7 +76,7 @@ ENDHERE
fi

# Apply proper permissions to the keys
chown "${CHOWN_OPT[@]}" ceph. "$MON_KEYRING"
chown "${CHOWN_OPT[@]}" ceph. "$MON_KEYRING" "$ADMIN_KEYRING"

if [ ! -e "$MONMAP" ]; then
if [ -e /etc/ceph/monmap ]; then
Expand Down
14 changes: 0 additions & 14 deletions src/daemon/demo.sh
Expand Up @@ -58,19 +58,6 @@ if [[ "$RGW_FRONTEND_TYPE" == "beast" ]]; then
fi


function fetch_initial_keys {
# This is only valid starting from nautilus
if [[ "$CEPH_VERSION" == "luminous" || "$CEPH_VERSION" == "mimic" ]]; then
return
fi

for keyring in /var/lib/ceph/mon/*/keyring; do
for key in $(ceph -n mon. -k "$keyring" auth list |& grep ^client); do
ceph -n mon. -k "$keyring" auth get "$key" -o "$key"
done
done
}

#######
# MON #
#######
Expand All @@ -80,7 +67,6 @@ function bootstrap_mon {
start_mon

chown --verbose ceph. /etc/ceph/*
fetch_initial_keys
}


Expand Down

0 comments on commit 9d6da0c

Please sign in to comment.