From: Sage Weil <sage@redhat.com>
Date: Thu, 30 Jul 2015 14:00:29 +0000 (-0400)
Subject: remove ceph-disk-{activate,prepare} wrappers
X-Git-Tag: v9.1.0~439^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=69cdfcb15f2ab582e1fdc21296794350d38b093e;p=ceph.git

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>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 2af2a8567abb..7edea1adbc33 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -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
diff --git a/debian/ceph.install b/debian/ceph.install
index dce279155ea8..353f200fe3ad 100644
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -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
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bad7147175c9..4db896d0491d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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)
 
diff --git a/src/Makefile-server.am b/src/Makefile-server.am
index 3cd522983213..689b5c445f67 100644
--- a/src/Makefile-server.am
+++ b/src/Makefile-server.am
@@ -37,8 +37,6 @@ if WITH_OSD
 
 ceph_sbin_SCRIPTS += \
 	ceph-disk \
-	ceph-disk-prepare \
-	ceph-disk-activate \
 	ceph-disk-udev
 
 bin_SCRIPTS += \
diff --git a/src/Makefile.am b/src/Makefile.am
index 8d03b898fba8..502f83a014fc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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 \
diff --git a/src/ceph-disk-activate b/src/ceph-disk-activate
deleted file mode 100755
index 72e89f9af30b..000000000000
--- a/src/ceph-disk-activate
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-dir=`dirname $0`
-$dir/ceph-disk activate $*
diff --git a/src/ceph-disk-prepare b/src/ceph-disk-prepare
deleted file mode 100755
index f9255eb88316..000000000000
--- a/src/ceph-disk-prepare
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-dir=`dirname $0`
-$dir/ceph-disk prepare $*
diff --git a/src/ceph-disk-udev b/src/ceph-disk-udev
index dd2ac0864594..8846d26030e4 100755
--- a/src/ceph-disk-udev
+++ b/src/ceph-disk-udev
@@ -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)
diff --git a/udev/95-ceph-osd.rules b/udev/95-ceph-osd.rules
index 6498cfeab4ac..75f443f4b3bc 100644
--- a/udev/95-ceph-osd.rules
+++ b/udev/95-ceph-osd.rules
@@ -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}"