RepoMirrors
/
ceph
mirror of https://github.com/ceph/ceph
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove ceph-disk-{activate,prepare} wrappers 

These ancient aliases shouldn't be used.  We should have removed them
immediately way back when, honestly.

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2015-07-30 10:00:29 -04:00
parent e034c2af43
commit 69cdfcb15f
9 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceph.spec.in
View File

@ -712,8 +712,6 @@ mkdir -p %{_localstatedir}/run/ceph/
%{_sbindir}/rcceph
%endif
%{_sbindir}/ceph-disk
%{_sbindir}/ceph-disk-activate
%{_sbindir}/ceph-disk-prepare
%{_sbindir}/ceph-disk-udev
%{_sbindir}/ceph-create-keys
%{_sbindir}/rcceph

2
debian/ceph.install vendored
View File

@ -3,8 +3,6 @@ lib/udev/rules.d/95-ceph-osd.rules
lib/udev/rules.d/60-ceph-partuuid-workaround.rules
usr/sbin/ceph-create-keys
usr/sbin/ceph-disk
usr/sbin/ceph-disk-activate
usr/sbin/ceph-disk-prepare
usr/bin/ceph-detect-init
usr/bin/ceph-clsinfo
usr/bin/ceph-debugpack

2
src/CMakeLists.txt
View File

@ -617,8 +617,6 @@ install(PROGRAMS
install(PROGRAMS
${CMAKE_SOURCE_DIR}/src/ceph-create-keys
${CMAKE_SOURCE_DIR}/src/ceph-disk
${CMAKE_SOURCE_DIR}/src/ceph-disk-activate
${CMAKE_SOURCE_DIR}/src/ceph-disk-prepare
${CMAKE_SOURCE_DIR}/src/ceph-disk-udev
DESTINATION sbin)

2
src/Makefile-server.am
View File

@ -37,8 +37,6 @@ if WITH_OSD
ceph_sbin_SCRIPTS += \
ceph-disk \
ceph-disk-prepare \
ceph-disk-activate \
ceph-disk-udev
bin_SCRIPTS += \

2
src/Makefile.am
View File

@ -97,8 +97,6 @@ EXTRA_DIST += \
$(srcdir)/upstart/rbdmap.conf \
ceph.in \
ceph-disk \
ceph-disk-prepare \
ceph-disk-activate \
ceph-disk-udev \
ceph-create-keys \
ceph-rest-api \

3
src/ceph-disk-activate
View File

@ -1,3 +0,0 @@
#!/bin/sh
dir=`dirname $0`
$dir/ceph-disk activate $*

3
src/ceph-disk-prepare
View File

@ -1,3 +0,0 @@
#!/bin/sh
dir=`dirname $0`
$dir/ceph-disk prepare $*

4
src/ceph-disk-udev
View File

@ -56,7 +56,7 @@ case $ID_PART_ENTRY_TYPE in
# for dm-crypted data devices
/sbin/cryptsetup --key-file /etc/ceph/dmcrypt-keys/${ID_PART_ENTRY_UUID} --key-size 256 create ${ID_PART_ENTRY_UUID} /dev/${NAME}
bash -c 'while [ ! -e /dev/mapper/${ID_PART_ENTRY_UUID} ];do sleep 1; done'
/usr/sbin/ceph-disk-activate /dev/mapper/${ID_PART_ENTRY_UUID}
/usr/sbin/ceph-disk activate /dev/mapper/${ID_PART_ENTRY_UUID}
;;
4fbd7e29-9d25-41b8-afd0-35865ceff05d)
@ -65,7 +65,7 @@ case $ID_PART_ENTRY_TYPE in
# for dm-crypted data devices
/sbin/cryptsetup --key-file /etc/ceph/dmcrypt-keys/${ID_PART_ENTRY_UUID} luksOpen /dev/${NAME} ${ID_PART_ENTRY_UUID}
bash -c 'while [ ! -e /dev/mapper/${ID_PART_ENTRY_UUID} ];do sleep 1; done'
/usr/sbin/ceph-disk-activate /dev/mapper/${ID_PART_ENTRY_UUID}
/usr/sbin/ceph-disk activate /dev/mapper/${ID_PART_ENTRY_UUID}
;;
89c57f98-2fe5-4dc0-89c1-f3ad0ceff2be)

6
udev/95-ceph-osd.rules
View File

@ -2,7 +2,7 @@
ACTION=="add", SUBSYSTEM=="block", \
ENV{DEVTYPE}=="partition", \
ENV{ID_PART_ENTRY_TYPE}=="4fbd7e29-9d25-41b8-afd0-062c0ceff05d", \
RUN+="/usr/sbin/ceph-disk-activate /dev/$name"
RUN+="/usr/sbin/ceph-disk activate /dev/$name"
# activate ceph-tagged partitions
ACTION=="add", SUBSYSTEM=="block", \
@ -30,7 +30,7 @@ ACTION=="add" SUBSYSTEM=="block", \
ENV{ID_PART_ENTRY_TYPE}=="4fbd7e29-9d25-41b8-afd0-5ec00ceff05d", \
RUN+="/sbin/cryptsetup --key-file /etc/ceph/dmcrypt-keys/$env{ID_PART_ENTRY_UUID} --key-size 256 create $env{ID_PART_ENTRY_UUID} /dev/$name", \
RUN+="/bin/bash -c 'while [ ! -e /dev/mapper/$env{ID_PART_ENTRY_UUID} ];do sleep 1; done'", \
RUN+="/usr/sbin/ceph-disk-activate /dev/mapper/$env{ID_PART_ENTRY_UUID}"
RUN+="/usr/sbin/ceph-disk activate /dev/mapper/$env{ID_PART_ENTRY_UUID}"
# Map data device and
# activate ceph-tagged partitions
@ -40,4 +40,4 @@ ACTION=="add" SUBSYSTEM=="block", \
ENV{ID_PART_ENTRY_TYPE}=="4fbd7e29-9d25-41b8-afd0-35865ceff05d", \
RUN+="/sbin/cryptsetup --key-file /etc/ceph/dmcrypt-keys/$env{ID_PART_ENTRY_UUID}.luks.key luksOpen /dev/$name $env{ID_PART_ENTRY_UUID}", \
RUN+="/bin/bash -c 'while [ ! -e /dev/mapper/$env{ID_PART_ENTRY_UUID} ];do sleep 1; done'", \
RUN+="/usr/sbin/ceph-disk-activate /dev/mapper/$env{ID_PART_ENTRY_UUID}"
RUN+="/usr/sbin/ceph-disk activate /dev/mapper/$env{ID_PART_ENTRY_UUID}"