diff --git a/src/vmm_mad/remotes/vcenter/detach_disk b/src/vmm_mad/remotes/vcenter/detach_disk index abca3c90ae..65c5cbb195 100755 --- a/src/vmm_mad/remotes/vcenter/detach_disk +++ b/src/vmm_mad/remotes/vcenter/detach_disk @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/bin/sh # -------------------------------------------------------------------------- # # Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # @@ -16,41 +16,8 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -ONE_LOCATION ||= ENV['ONE_LOCATION'] +# Detach disk functionality is implemented in src/tm_mad/vcenter/delete -if !ONE_LOCATION - RUBY_LIB_LOCATION ||= '/usr/lib/one/ruby' - GEMS_LOCATION ||= '/usr/share/one/gems' -else - RUBY_LIB_LOCATION ||= ONE_LOCATION + '/lib/ruby' - GEMS_LOCATION ||= ONE_LOCATION + '/share/gems' -end +STDIN=`cat -` -$LOAD_PATH << RUBY_LIB_LOCATION -$LOAD_PATH << File.dirname(__FILE__) - -require 'vcenter_driver' - -vm_ref = ARGV[0] -vc_cluster_name = ARGV[-1] - -drv_action = OpenNebula::XMLElement.new -drv_action.initialize_xml(Base64.decode64(STDIN.read), 'VMM_DRIVER_ACTION_DATA') - -host_id = drv_action['VM/HISTORY_RECORDS/HISTORY/HID'] - -begin - vi_client = VCenterDriver::VIClient.new_from_host(host_id) - - VCenterDriver::VirtualMachine.new_without_id(vi_client, vm_ref) -rescue StandardError => e - message = "Detach DISK for VM #{vm_ref} on vCenter cluster " \ - "#{vc_cluster_name} failed due to \"#{e.message}\"." - OpenNebula.log_error(message) - if VCenterDriver::CONFIG[:debug_information] - STDERR.puts "#{message} #{e.backtrace}" - end - exit(-1) -ensure - vi_client.close_connection if vi_client -end +exit 0 diff --git a/src/vmm_mad/remotes/vcenter/prereconfigure b/src/vmm_mad/remotes/vcenter/prereconfigure deleted file mode 100755 index 07a7b691ba..0000000000 --- a/src/vmm_mad/remotes/vcenter/prereconfigure +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -# -------------------------------------------------------------------------- # -# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # -# # -# 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. # -#--------------------------------------------------------------------------- # - -STDIN=`cat -` - -exit 0 diff --git a/src/vmm_mad/remotes/vcenter/prereconfigure b/src/vmm_mad/remotes/vcenter/prereconfigure new file mode 120000 index 0000000000..300563f2ad --- /dev/null +++ b/src/vmm_mad/remotes/vcenter/prereconfigure @@ -0,0 +1 @@ +../common/dummy.sh \ No newline at end of file