diff --git a/install.sh b/install.sh index bb91301428..116dd0ebf3 100755 --- a/install.sh +++ b/install.sh @@ -909,7 +909,6 @@ TM_VMFS_FILES="src/tm_mad/vmfs/clone \ src/tm_mad/vmfs/mv \ src/tm_mad/vmfs/context \ src/tm_mad/vmfs/mvds \ - src/tm_mad/vmfs/tm_vmfs.conf \ src/tm_mad/vmfs/postmigrate \ src/tm_mad/vmfs/premigrate" diff --git a/src/tm_mad/vmfs/clone b/src/tm_mad/vmfs/clone index c5ec706223..1202009243 100755 --- a/src/tm_mad/vmfs/clone +++ b/src/tm_mad/vmfs/clone @@ -39,7 +39,6 @@ else fi . $TMCOMMON -source $(dirname $0)/tm_vmfs.conf #------------------------------------------------------------------------------- # Retrieve needed information, set dst path and dir diff --git a/src/tm_mad/vmfs/context b/src/tm_mad/vmfs/context index 48b8500218..d17b0a98be 100755 --- a/src/tm_mad/vmfs/context +++ b/src/tm_mad/vmfs/context @@ -39,7 +39,6 @@ else fi . $TMCOMMON -source $(dirname $0)/tm_vmfs.conf #------------------------------------------------------------------------------- # Retrieve needed information, set dst path and dir diff --git a/src/tm_mad/vmfs/delete b/src/tm_mad/vmfs/delete index 88abb15a5f..9c289c582d 100755 --- a/src/tm_mad/vmfs/delete +++ b/src/tm_mad/vmfs/delete @@ -39,7 +39,6 @@ else fi . $TMCOMMON -source $(dirname $0)/tm_vmfs.conf DST_PATH=`arg_path $DST` DST_HOST=`arg_host $DST` diff --git a/src/tm_mad/vmfs/ln b/src/tm_mad/vmfs/ln index 8613d4ad71..5a0afb93d4 100755 --- a/src/tm_mad/vmfs/ln +++ b/src/tm_mad/vmfs/ln @@ -37,7 +37,6 @@ else fi . $TMCOMMON -source $(dirname $0)/tm_vmfs.conf #------------------------------------------------------------------------------- # Retrieve needed information, set dst path and dir diff --git a/src/tm_mad/vmfs/mkimage b/src/tm_mad/vmfs/mkimage index 339eec878e..97907b3985 100755 --- a/src/tm_mad/vmfs/mkimage +++ b/src/tm_mad/vmfs/mkimage @@ -40,7 +40,6 @@ else fi . $TMCOMMON -source $(dirname $0)/tm_vmfs.conf #------------------------------------------------------------------------------- # Retrieve needed information, set dst path and dir diff --git a/src/tm_mad/vmfs/mvds b/src/tm_mad/vmfs/mvds index c733dc3393..acd445dc48 100755 --- a/src/tm_mad/vmfs/mvds +++ b/src/tm_mad/vmfs/mvds @@ -39,7 +39,6 @@ else fi . $TMCOMMON -source $(dirname $0)/tm_vmfs.conf #------------------------------------------------------------------------------- # Retrieve needed information, set dst path and dir diff --git a/src/tm_mad/vmfs/tm_vmfs.conf b/src/tm_mad/vmfs/tm_vmfs.conf deleted file mode 100644 index d914606ffc..0000000000 --- a/src/tm_mad/vmfs/tm_vmfs.conf +++ /dev/null @@ -1,20 +0,0 @@ -# -------------------------------------------------------------------------- # -# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org) # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); you may # -# not use this file except in compliance with the License. You may obtain # -# a copy of the License at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" BASIS, # -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -#--------------------------------------------------------------------------- # - -# Whether the TM VMware driver should use to invoke the VMFS native commands -# * remote API calls (value set to "no") -# * ssh connection (value set to "yes") -TM_USE_SSH=no