From ed5cc509320329e61e1d7325bc67bc98b5f834f9 Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Mon, 16 Nov 2015 10:48:40 +0100 Subject: [PATCH] Feature #3987: remove explicit loading of scripts_common.sh as it's already being loaded by tm_common.sh --- src/tm_mad/ceph/clone | 1 - src/tm_mad/ceph/cpds | 1 - src/tm_mad/ceph/delete | 1 - src/tm_mad/ceph/ln | 1 - src/tm_mad/ceph/mkimage | 1 - src/tm_mad/ceph/monitor | 2 +- src/tm_mad/ceph/snap_create | 1 - src/tm_mad/ceph/snap_create_live | 1 - src/tm_mad/ceph/snap_delete | 1 - src/tm_mad/ceph/snap_revert | 1 - 10 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/tm_mad/ceph/clone b/src/tm_mad/ceph/clone index 62a608f850..0b31ada78c 100755 --- a/src/tm_mad/ceph/clone +++ b/src/tm_mad/ceph/clone @@ -39,7 +39,6 @@ fi DRIVER_PATH=$(dirname $0) -source $LIB_LOCATION/sh/scripts_common.sh source $TMCOMMON source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf diff --git a/src/tm_mad/ceph/cpds b/src/tm_mad/ceph/cpds index 01b780d4a9..8d544ef695 100755 --- a/src/tm_mad/ceph/cpds +++ b/src/tm_mad/ceph/cpds @@ -41,7 +41,6 @@ fi DRIVER_PATH=$(dirname $0) -source $LIB_LOCATION/sh/scripts_common.sh source $TMCOMMON source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf diff --git a/src/tm_mad/ceph/delete b/src/tm_mad/ceph/delete index db8af22993..19cebb34c6 100755 --- a/src/tm_mad/ceph/delete +++ b/src/tm_mad/ceph/delete @@ -36,7 +36,6 @@ fi DRIVER_PATH=$(dirname $0) -source $LIB_LOCATION/sh/scripts_common.sh source $TMCOMMON source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf source ${DRIVER_PATH}/../../datastore/libfs.sh diff --git a/src/tm_mad/ceph/ln b/src/tm_mad/ceph/ln index 5d08b8216d..8241f11f55 100755 --- a/src/tm_mad/ceph/ln +++ b/src/tm_mad/ceph/ln @@ -39,7 +39,6 @@ fi DRIVER_PATH=$(dirname $0) -source $LIB_LOCATION/sh/scripts_common.sh source $TMCOMMON source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf diff --git a/src/tm_mad/ceph/mkimage b/src/tm_mad/ceph/mkimage index 3c949c6c26..2d9ced948b 100755 --- a/src/tm_mad/ceph/mkimage +++ b/src/tm_mad/ceph/mkimage @@ -43,7 +43,6 @@ fi DRIVER_PATH=$(dirname $0) -source $LIB_LOCATION/sh/scripts_common.sh source $TMCOMMON source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf diff --git a/src/tm_mad/ceph/monitor b/src/tm_mad/ceph/monitor index 195edc8df0..883339fd4d 100755 --- a/src/tm_mad/ceph/monitor +++ b/src/tm_mad/ceph/monitor @@ -32,7 +32,7 @@ fi DRIVER_PATH=$(dirname $0) source ${DRIVER_PATH}/../../datastore/libfs.sh -source ${DRIVER_PATH}/ceph.conf +source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf # -------- Get datastore arguments from OpenNebula core ------------ diff --git a/src/tm_mad/ceph/snap_create b/src/tm_mad/ceph/snap_create index 0bae3a124c..998a876edb 100755 --- a/src/tm_mad/ceph/snap_create +++ b/src/tm_mad/ceph/snap_create @@ -35,7 +35,6 @@ fi DRIVER_PATH=$(dirname $0) -source $LIB_LOCATION/sh/scripts_common.sh source $TMCOMMON source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf diff --git a/src/tm_mad/ceph/snap_create_live b/src/tm_mad/ceph/snap_create_live index 1747edcde7..24a818fa36 100755 --- a/src/tm_mad/ceph/snap_create_live +++ b/src/tm_mad/ceph/snap_create_live @@ -35,7 +35,6 @@ fi DRIVER_PATH=$(dirname $0) -source $LIB_LOCATION/sh/scripts_common.sh source $TMCOMMON source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf diff --git a/src/tm_mad/ceph/snap_delete b/src/tm_mad/ceph/snap_delete index b87cc04e87..9810c6cacc 100755 --- a/src/tm_mad/ceph/snap_delete +++ b/src/tm_mad/ceph/snap_delete @@ -35,7 +35,6 @@ fi DRIVER_PATH=$(dirname $0) -source $LIB_LOCATION/sh/scripts_common.sh source $TMCOMMON source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf diff --git a/src/tm_mad/ceph/snap_revert b/src/tm_mad/ceph/snap_revert index 909aa9cd0f..a11fd60421 100755 --- a/src/tm_mad/ceph/snap_revert +++ b/src/tm_mad/ceph/snap_revert @@ -35,7 +35,6 @@ fi DRIVER_PATH=$(dirname $0) -source $LIB_LOCATION/sh/scripts_common.sh source $TMCOMMON source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf