Skip to content

Commit

Permalink
src/daemon: remove ceph-disk support
Browse files Browse the repository at this point in the history
In nautilus, ceph-disk isn't present anymore so some OSD scenarios
aren't usefull anymore.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
  • Loading branch information
dsavineau committed Apr 12, 2019
1 parent cb4dfa8 commit 799ec3d
Show file tree
Hide file tree
Showing 10 changed files with 630 additions and 37 deletions.
204 changes: 204 additions & 0 deletions ceph-releases/luminous/daemon/entrypoint.sh.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@
#!/bin/bash

# We need the -m to track child process in docker_exec.sh
# It is expected to receive some SIGCHLD, so -m is mandatory
set -me
export LC_ALL=C

source /opt/ceph-container/bin/variables_entrypoint.sh
source /opt/ceph-container/bin/common_functions.sh
source /opt/ceph-container/bin/docker_exec.sh
source /opt/ceph-container/bin/debug.sh

###########################
# CONFIGURATION GENERATOR #
###########################

# Load in the bootstrapping routines
# based on the data store
case "$KV_TYPE" in
etcd)
# TAG: kv_type_etcd
source /opt/ceph-container/bin/config.kv.etcd.sh
;;
k8s|kubernetes)
# TAG: kv_type_k8s
source /opt/ceph-container/bin/config.k8s.sh
;;
*)
source /opt/ceph-container/bin/config.static.sh
;;
esac


###############
# CEPH_DAEMON #
###############

# Normalize DAEMON to lowercase
CEPH_DAEMON=$(to_lowercase "${CEPH_DAEMON}")

create_mandatory_directories

if [[ ! "x86_64 aarch64" =~ $CEPH_ARCH ]] ; then
echo "$CEPH_DAEMON is not supported on $CEPH_ARCH" >&2
exit 1
fi

# If we are given a valid first argument, set the
# CEPH_DAEMON variable from it
case "$CEPH_DAEMON" in
populate_kvstore)
# TAG: populate_kvstore
source /opt/ceph-container/bin/populate_kv.sh
populate_kv
;;
mon)
# TAG: mon
source /opt/ceph-container/bin/start_mon.sh
start_mon
;;
osd)
# TAG: osd
source /opt/ceph-container/bin/start_osd.sh
start_osd
;;
osd_directory)
# TAG: osd_directory
source /opt/ceph-container/bin/start_osd.sh
OSD_TYPE="directory"
start_osd
;;
osd_directory_single)
# TAG: osd_directory_single
source /opt/ceph-container/bin/start_osd.sh
OSD_TYPE="directory_single"
start_osd
;;
osd_ceph_disk)
# TAG: osd_ceph_disk
source /opt/ceph-container/bin/start_osd.sh
OSD_TYPE="disk"
start_osd
;;
osd_ceph_disk_prepare)
# TAG: osd_ceph_disk_prepare
source /opt/ceph-container/bin/start_osd.sh
OSD_TYPE="prepare"
start_osd
;;
osd_ceph_disk_activate)
# TAG: osd_ceph_disk_activate
source /opt/ceph-container/bin/start_osd.sh
OSD_TYPE="activate"
start_osd
;;
osd_ceph_activate_journal)
# TAG: osd_ceph_activate_journal
source /opt/ceph-container/bin/start_osd.sh
OSD_TYPE="activate_journal"
start_osd
;;
osd_ceph_volume_activate)
ami_privileged
# shellcheck disable=SC1091
# TAG: osd_ceph_volume_activate
source /opt/ceph-container/bin/osd_volume_activate.sh
osd_volume_activate
;;
mds)
# TAG: mds
source /opt/ceph-container/bin/start_mds.sh
start_mds
;;
rgw)
# TAG: rgw
source /opt/ceph-container/bin/start_rgw.sh
start_rgw
;;
rgw_user)
# TAG: rgw_user
source /opt/ceph-container/bin/start_rgw.sh
create_rgw_user
;;
restapi)
# TAG: restapi
source /opt/ceph-container/bin/start_restapi.sh
start_restapi
;;
rbd_mirror)
# TAG: rbd_mirror
source /opt/ceph-container/bin/start_rbd_mirror.sh
start_rbd_mirror
;;
nfs)
# TAG: nfs
source /opt/ceph-container/bin/start_nfs.sh
start_nfs
;;
zap_device)
# TAG: zap_device
source /opt/ceph-container/bin/zap_device.sh
zap_device
;;
mon_health)
# TAG: mon_health
source /opt/ceph-container/bin/watch_mon_health.sh
watch_mon_health
;;
mgr)
# TAG: mgr
source /opt/ceph-container/bin/start_mgr.sh
start_mgr
;;
disk_introspection)
# TAG: disk_introspection
if [[ "$KV_TYPE" =~ k8s|kubernetes ]]; then
source /opt/ceph-container/bin/disk_introspection.sh
else
log "You can not use the disk introspection method outside a Kubernetes environment"
log "Make sure KV_TYPE equals either k8s or kubernetes"
fi
;;
demo)
# TAG: demo
source /opt/ceph-container/bin/demo.sh
;;
disk_list)
# TAG: disk_list
source /opt/ceph-container/bin/disk_list.sh
start_disk_list
;;
tcmu_runner)
# TAG: tcmu_runner
if is_redhat; then
source /opt/ceph-container/bin/start_tcmu_runner.sh
start_tcmu_runner
else
log "ERROR: tcmu_runner scenario is only available on Red Hat systems."
fi
;;
rbd_target_api)
# TAG: rbd_target_api
if is_redhat; then
source /opt/ceph-container/bin/start_rbd_target_api.sh
start_rbd_target_api
else
log "ERROR: rbd_target_api scenario is only available on Red Hat systems."
fi
;;
rbd_target_gw)
# TAG: rbd_target_gw
if is_redhat; then
source /opt/ceph-container/bin/start_rbd_target_gw.sh
start_rbd_target_gw
else
log "ERROR: rbd_target_gw scenario is only available on Red Hat systems."
fi
;;
*)
invalid_ceph_daemon
;;
esac

exit 0
62 changes: 62 additions & 0 deletions ceph-releases/luminous/daemon/start_osd.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
#!/bin/bash
set -e

if is_redhat; then
if [[ -n "${TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES}" ]]; then
sed -i -e "s/^\(TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES\)=.*/\1=${TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES}/" /etc/sysconfig/ceph
fi
source /etc/sysconfig/ceph
fi

function start_osd {
get_config
check_config

if [ "${CEPH_GET_ADMIN_KEY}" -eq 1 ]; then
get_admin_key
check_admin_key
fi

case "$OSD_TYPE" in
directory)
source /opt/ceph-container/bin/osd_directory.sh
source /opt/ceph-container/bin/osd_common.sh
osd_directory
;;
directory_single)
source /opt/ceph-container/bin/osd_directory_single.sh
osd_directory_single
;;
disk)
osd_disk
;;
prepare)
source /opt/ceph-container/bin/osd_disk_prepare.sh
osd_disk_prepare
;;
activate)
source /opt/ceph-container/bin/osd_disk_activate.sh
osd_activate
;;
devices)
source /opt/ceph-container/bin/osd_disks.sh
source /opt/ceph-container/bin/osd_common.sh
osd_disks
;;
activate_journal)
source /opt/ceph-container/bin/osd_activate_journal.sh
source /opt/ceph-container/bin/osd_common.sh
osd_activate_journal
;;
*)
osd_trying_to_determine_scenario
;;
esac
}

function osd_disk {
source /opt/ceph-container/bin/osd_disk_prepare.sh
source /opt/ceph-container/bin/osd_disk_activate.sh
osd_disk_prepare
osd_activate
}

0 comments on commit 799ec3d

Please sign in to comment.