shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-04-01 06:50:25 +03:00
Code Releases Wiki Activity

B #1588: Separate remote scripts configuration (#1667)

Browse Source
This commit is contained in:
Ruben S. Montero 2018-01-18 12:27:38 +01:00 committed by GitHub
parent 85d3724a37
commit d86e27b4f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
48 changed files with 160 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
install.sh
View File

@ -241,6 +241,11 @@ LIB_DIRS="$LIB_LOCATION/ruby \
$LIB_LOCATION/ruby/vcenter_driver"
VAR_DIRS="$VAR_LOCATION/remotes \
$VAR_LOCATION/remotes/etc \
$VAR_LOCATION/remotes/etc/datastore/ceph \
$VAR_LOCATION/remotes/etc/im/kvm-probes.d \
$VAR_LOCATION/remotes/etc/vmm/kvm \
$VAR_LOCATION/remotes/etc/vnm \
$VAR_LOCATION/remotes/im \
$VAR_LOCATION/remotes/im/kvm.d \
$VAR_LOCATION/remotes/im/kvm-probes.d \
@ -374,6 +379,7 @@ INSTALL_FILES=(
IM_PROBES_FILES:$VAR_LOCATION/remotes/im
IM_PROBES_KVM_FILES:$VAR_LOCATION/remotes/im/kvm.d
IM_PROBES_KVM_PROBES_FILES:$VAR_LOCATION/remotes/im/kvm-probes.d
IM_PROBES_ETC_KVM_PROBES_FILES:$VAR_LOCATION/remotes/etc/im/kvm-probes.d
IM_PROBES_VCENTER_FILES:$VAR_LOCATION/remotes/im/vcenter.d
IM_PROBES_EC2_FILES:$VAR_LOCATION/remotes/im/ec2.d
IM_PROBES_AZ_FILES:$VAR_LOCATION/remotes/im/az.d
@ -388,6 +394,7 @@ INSTALL_FILES=(
VMM_EXEC_LIB_FILES:$VAR_LOCATION/remotes/vmm/lib
VMM_EXEC_LIB_VCENTER_FILES:$LIB_LOCATION/ruby/vcenter_driver
VMM_EXEC_KVM_SCRIPTS:$VAR_LOCATION/remotes/vmm/kvm
VMM_EXEC_ETC_KVM_SCRIPTS:$VAR_LOCATION/remotes/etc/vmm/kvm
VMM_EXEC_VCENTER_SCRIPTS:$VAR_LOCATION/remotes/vmm/vcenter
VMM_EXEC_EC2_SCRIPTS:$VAR_LOCATION/remotes/vmm/ec2
VMM_EXEC_AZ_SCRIPTS:$VAR_LOCATION/remotes/vmm/az
@ -405,6 +412,7 @@ INSTALL_FILES=(
DATASTORE_DRIVER_DUMMY_SCRIPTS:$VAR_LOCATION/remotes/datastore/dummy
DATASTORE_DRIVER_FS_SCRIPTS:$VAR_LOCATION/remotes/datastore/fs
DATASTORE_DRIVER_CEPH_SCRIPTS:$VAR_LOCATION/remotes/datastore/ceph
DATASTORE_DRIVER_ETC_CEPH_SCRIPTS:$VAR_LOCATION/remotes/etc/datastore/ceph
DATASTORE_DRIVER_DEV_SCRIPTS:$VAR_LOCATION/remotes/datastore/dev
DATASTORE_DRIVER_VCENTER_SCRIPTS:$VAR_LOCATION/remotes/datastore/vcenter
DATASTORE_DRIVER_ISCSI_SCRIPTS:$VAR_LOCATION/remotes/datastore/iscsi_libvirt
@ -413,6 +421,7 @@ INSTALL_FILES=(
MARKETPLACE_DRIVER_S3_SCRIPTS:$VAR_LOCATION/remotes/market/s3
IPAM_DRIVER_DUMMY_SCRIPTS:$VAR_LOCATION/remotes/ipam/dummy
NETWORK_FILES:$VAR_LOCATION/remotes/vnm
NETWORK_ETC_FILES:$VAR_LOCATION/remotes/etc/vnm
NETWORK_8021Q_FILES:$VAR_LOCATION/remotes/vnm/802.1Q
NETWORK_VXLAN_FILES:$VAR_LOCATION/remotes/vnm/vxlan
NETWORK_DUMMY_FILES:$VAR_LOCATION/remotes/vnm/dummy
@ -677,7 +686,6 @@ VMM_EXEC_LIB_VCENTER_FILES="src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb
VMM_EXEC_KVM_SCRIPTS="src/vmm_mad/remotes/kvm/cancel \
src/vmm_mad/remotes/kvm/deploy \
src/vmm_mad/remotes/kvm/kvmrc \
src/vmm_mad/remotes/kvm/migrate \
src/vmm_mad/remotes/kvm/migrate_local \
src/vmm_mad/remotes/kvm/restore \
@ -699,6 +707,12 @@ VMM_EXEC_KVM_SCRIPTS="src/vmm_mad/remotes/kvm/cancel \
src/vmm_mad/remotes/kvm/prereconfigure \
src/vmm_mad/remotes/kvm/resize_disk"
#-------------------------------------------------------------------------------
# VMM configuration KVM scripts, to be installed under $REMOTES_LOCATION/etc/vmm/kvm
#-------------------------------------------------------------------------------
VMM_EXEC_ETC_KVM_SCRIPTS="src/vmm_mad/remotes/kvm/kvmrc"
#-------------------------------------------------------------------------------
# VMM Driver vCenter scripts, installed under $REMOTES_LOCATION/vmm/vcenter
#-------------------------------------------------------------------------------
@ -792,6 +806,8 @@ IM_PROBES_KVM_PROBES_FILES="src/im_mad/remotes/kvm-probes.d/kvm.rb \
src/im_mad/remotes/common.d/version.sh \
src/im_mad/remotes/common.d/collectd-client-shepherd.sh"
IM_PROBES_ETC_KVM_PROBES_FILES="src/im_mad/remotes/kvm-probes.d/pci.conf"
IM_PROBES_VCENTER_FILES="src/im_mad/remotes/vcenter.d/poll"
IM_PROBES_EC2_FILES="src/im_mad/remotes/ec2.d/poll"
@ -824,7 +840,6 @@ AUTH_PLAIN_FILES="src/authm_mad/remotes/plain/authenticate"
NETWORK_FILES="src/vnm_mad/remotes/lib/vnm_driver.rb \
src/vnm_mad/remotes/lib/vnmmad.rb \
src/vnm_mad/remotes/OpenNebulaNetwork.conf \
src/vnm_mad/remotes/lib/sg_driver.rb \
src/vnm_mad/remotes/lib/address.rb \
src/vnm_mad/remotes/lib/command.rb \
@ -873,6 +888,12 @@ NETWORK_VCENTER_FILES="src/vnm_mad/remotes/vcenter/pre \
src/vnm_mad/remotes/vcenter/post \
src/vnm_mad/remotes/vcenter/clean"
#-------------------------------------------------------------------------------
# Virtual Network Manager drivers configuration to be installed under $REMOTES_LOCATION/etc/vnm
#-------------------------------------------------------------------------------
NETWORK_ETC_FILES="src/vnm_mad/remotes/OpenNebulaNetwork.conf"
#-------------------------------------------------------------------------------
# IPAM drivers to be installed under $REMOTES_LOCATION/ipam
#-------------------------------------------------------------------------------
@ -1104,10 +1125,11 @@ DATASTORE_DRIVER_CEPH_SCRIPTS="src/datastore_mad/remotes/ceph/cp \
src/datastore_mad/remotes/ceph/snap_delete \
src/datastore_mad/remotes/ceph/snap_revert \
src/datastore_mad/remotes/ceph/snap_flatten \
src/datastore_mad/remotes/ceph/ceph.conf \
src/datastore_mad/remotes/ceph/ceph_utils.sh \
src/datastore_mad/remotes/ceph/export"
DATASTORE_DRIVER_ETC_CEPH_SCRIPTS="src/datastore_mad/remotes/ceph/ceph.conf"
DATASTORE_DRIVER_DEV_SCRIPTS="src/datastore_mad/remotes/dev/cp \
src/datastore_mad/remotes/dev/mkfs \
src/datastore_mad/remotes/dev/stat \

2
src/datastore_mad/remotes/ceph/clone
View File

@ -31,7 +31,7 @@ fi
DRIVER_PATH=$(dirname $0)
source ${DRIVER_PATH}/../libfs.sh
source ${DRIVER_PATH}/ceph.conf
source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
# -------- Get cp and datastore arguments from OpenNebula core ------------

2
src/datastore_mad/remotes/ceph/cp
View File

@ -33,7 +33,7 @@ fi
DRIVER_PATH=$(dirname $0)
source ${DRIVER_PATH}/../libfs.sh
source ${DRIVER_PATH}/ceph.conf
source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
# -------- Get cp and datastore arguments from OpenNebula core ------------

2
src/datastore_mad/remotes/ceph/export
View File

@ -32,7 +32,7 @@ fi
DRIVER_PATH=$(dirname $0)
source ${DRIVER_PATH}/../libfs.sh
source ${DRIVER_PATH}/ceph.conf
source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
# -------- Get rm and datastore arguments from OpenNebula core ------------

2
src/datastore_mad/remotes/ceph/mkfs
View File

@ -33,7 +33,7 @@ fi
DRIVER_PATH=$(dirname $0)
source ${DRIVER_PATH}/../libfs.sh
source ${DRIVER_PATH}/ceph.conf
source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
# -------- Get mkfs and datastore arguments from OpenNebula core ------------

2
src/datastore_mad/remotes/ceph/monitor
View File

@ -32,7 +32,7 @@ fi
DRIVER_PATH=$(dirname $0)
source ${DRIVER_PATH}/../libfs.sh
source ${DRIVER_PATH}/ceph.conf
source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
source ${DRIVER_PATH}/ceph_utils.sh
# -------- Get datastore arguments from OpenNebula core ------------

2
src/datastore_mad/remotes/ceph/rm
View File

@ -33,7 +33,7 @@ DRIVER_PATH=$(dirname $0)
CEPH_UTILS=${DRIVER_PATH}/ceph_utils.sh
source ${DRIVER_PATH}/../libfs.sh
source ${DRIVER_PATH}/ceph.conf
source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
# -------- Get rm and datastore arguments from OpenNebula core ------------

2
src/datastore_mad/remotes/ceph/snap_delete
View File

@ -34,7 +34,7 @@ DRIVER_PATH=$(dirname $0)
CEPH_UTILS=${DRIVER_PATH}/ceph_utils.sh
source ${DRIVER_PATH}/../libfs.sh
source ${DRIVER_PATH}/ceph.conf
source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
# -------- Get image and datastore arguments from OpenNebula core ------------

2
src/datastore_mad/remotes/ceph/snap_flatten
View File

@ -34,7 +34,7 @@ DRIVER_PATH=$(dirname $0)
CEPH_UTILS=${DRIVER_PATH}/ceph_utils.sh
source ${DRIVER_PATH}/../libfs.sh
source ${DRIVER_PATH}/ceph.conf
source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
# -------- Get image and datastore arguments from OpenNebula core ------------

2
src/datastore_mad/remotes/ceph/snap_revert
View File

@ -34,7 +34,7 @@ DRIVER_PATH=$(dirname $0)
CEPH_UTILS=${DRIVER_PATH}/ceph_utils.sh
source ${DRIVER_PATH}/../libfs.sh
source ${DRIVER_PATH}/ceph.conf
source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
# -------- Get image and datastore arguments from OpenNebula core ------------

66
src/im_mad/remotes/kvm-probes.d/pci.conf Normal file
View File

@ -0,0 +1,66 @@
# -------------------------------------------------------------------------- #
# Copyright 2002-2018, 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. #
#--------------------------------------------------------------------------- #
# This option specifies the main filters for PCI card monitoring. The format
# is the same as used by lspci to filter on PCI card by vendor:device(:class)
# identification. Several filters can be added as a list, or separated
# by commas. The NULL filter will retrieve all PCI cards.
#
# From lspci help:
# -d [<vendor>]:[<device>][:<class>]
# Show only devices with specified vendor, device and class ID.
# The ID's are given in hexadecimal and may be omitted or given
# as "*", both meaning "any value"#
#
# For example:
# :filter:
# - '10de:*' # all NVIDIA VGA cards
# - '10de:11bf' # only GK104GL [GRID K2]
# - '*:10d3' # only 82574L Gigabit Network cards
# - '8086::0c03' # only Intel USB controllers
#
# or
#
# :filter: '*:*' # all devices
#
# or
#
# :filter: '0:0' # no devices
#
:filter: '0:0'
# The PCI cards list restricted by the :filter option above can be even more
# filtered by the list of exact PCI addresses (bus:device.func).
#
# For example:
# :short_address:
# - '07:00.0'
# - '06:00.0'
#
:short_address: []
# The PCI cards list restricted by the :filter option above can be even more
# filtered by matching the device name against the list of regular expression
# case-insensitive patterns.
#
# For example:
# :device_name:
# - 'Virtual Function'
# - 'Gigabit Network'
# - 'USB.*Host Controller'
# - '^MegaRAID'
#
:device_name: []

60
src/im_mad/remotes/kvm-probes.d/pci.rb
View File

@ -16,42 +16,20 @@
# limitations under the License. #
#--------------------------------------------------------------------------- #
# This variable contains the filters for PCI card monitoring. The format
# is the same as lspci and several filters can be added separated by commas.
# A nil filter will retrieve all PCI cards.
#
# From lspci help:
# -d [<vendor>]:[<device>]
#
# For example
#
# FILTER = '10de:*' # all NVIDIA VGA cards
# FILTER = '10de:11bf' # only GK104GL [GRID K2]
# FILTER = '*:10d3' #Only 82574L Gigabit Network cards
# FILTER = '*:*' # all devices
# FILTER = '0:0' # no devices
#
# You can also filter by the SHORT_ADDRESS, to add only devices in a given address
#
# For example
#
# SHORT_ADDRESS = [ "07:00.0", "06:00.0" ]
#
# Finally you can match devices by device name patterns, only those devices that
# the pattern will be added to the list.
#
# For example
#
# DEVICE_NAME = [ /Virtual Function/, /Gigabit Network/]
#
# Note that these filters, if defined, are all applied
FILTER = "0:0"
SHORT_ADDRESS = []
DEVICE_NAME = []
require 'shellwords'
require 'yaml'
begin
NAME = File.join(File.dirname(__FILE__), '../../etc/im/kvm-probes.d/pci.conf')
CONF = {
:filter => '0:0',
:short_address => [],
:device_name => [],
}.merge(YAML.load_file(NAME))
rescue
STDERR.puts "Invalid configuration #{NAME}"
exit(-1)
end
def get_pci(filter=nil)
command = "lspci -mmnn"
@ -88,7 +66,7 @@ end
def get_devices(filter=nil)
if filter
filter = filter.split(',')
filter = [filter].flatten.map { |f| f.split(',') }.flatten
else
filter = [nil]
end
@ -98,7 +76,7 @@ def get_devices(filter=nil)
end.flatten
end
filter = FILTER
filter = CONF[:filter]
devices = get_devices(filter)
@ -107,11 +85,11 @@ def pval(name, value)
end
devices.each do |dev|
next if !SHORT_ADDRESS.empty? && !SHORT_ADDRESS.include?(dev[:short_address])
next if !CONF[:short_address].empty? && !CONF[:short_address].include?(dev[:short_address])
if !DEVICE_NAME.empty?
matched = DEVICE_NAME.each { |pattern|
break true if !(dev[:device_name] =~ pattern).nil?
if !CONF[:device_name].empty?
matched = CONF[:device_name].each { |pattern|
break true if !(dev[:device_name] =~ /#{pattern}/i).nil?
}
next if matched != true

2
src/tm_mad/ceph/clone
View File

@ -40,7 +40,7 @@ fi
DRIVER_PATH=$(dirname $0)
source $TMCOMMON
source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf
source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
CEPH_UTILS=${DRIVER_PATH}/../../datastore/ceph/ceph_utils.sh

4
src/tm_mad/ceph/cpds
View File

@ -42,8 +42,8 @@ fi
DRIVER_PATH=$(dirname $0)
source $TMCOMMON
source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf
source ${DRIVER_PATH}/../../vmm/kvm/kvmrc
source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
source ${DRIVER_PATH}/../../etc/vmm/kvm/kvmrc
CEPH_UTILS=${DRIVER_PATH}/../../datastore/ceph/ceph_utils.sh

2
src/tm_mad/ceph/delete
View File

@ -37,7 +37,7 @@ fi
DRIVER_PATH=$(dirname $0)
source $TMCOMMON
source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf
source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
source ${DRIVER_PATH}/../../datastore/libfs.sh
CEPH_UTILS=${DRIVER_PATH}/../../datastore/ceph/ceph_utils.sh

2
src/tm_mad/ceph/ln
View File

@ -40,7 +40,7 @@ fi
DRIVER_PATH=$(dirname $0)
source $TMCOMMON
source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf
source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
CEPH_UTILS=${DRIVER_PATH}/../../datastore/ceph/ceph_utils.sh

2
src/tm_mad/ceph/mkimage
View File

@ -45,7 +45,7 @@ DRIVER_PATH=$(dirname $0)
source $TMCOMMON
source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf
source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
source ${DRIVER_PATH}/../../datastore/libfs.sh
CEPH_UTILS=${DRIVER_PATH}/../../datastore/ceph/ceph_utils.sh

2
src/tm_mad/ceph/monitor
View File

@ -32,7 +32,7 @@ fi
DRIVER_PATH=$(dirname $0)
source ${DRIVER_PATH}/../../datastore/libfs.sh
source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf
source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
source ${DRIVER_PATH}/../../datastore/ceph/ceph_utils.sh
# -------- Get datastore arguments from OpenNebula core ------------

2
src/tm_mad/ceph/mvds
View File

@ -42,7 +42,7 @@ fi
DRIVER_PATH=$(dirname $0)
source $TMCOMMON
source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf
source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
CEPH_UTILS=${DRIVER_PATH}/../../datastore/ceph/ceph_utils.sh

2
src/tm_mad/ceph/resize
View File

@ -35,7 +35,7 @@ fi
DRIVER_PATH=$(dirname $0)
source $TMCOMMON
source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf
source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
CEPH_UTILS=${DRIVER_PATH}/../../datastore/ceph/ceph_utils.sh

2
src/tm_mad/ceph/snap_create
View File

@ -36,7 +36,7 @@ fi
DRIVER_PATH=$(dirname $0)
source $TMCOMMON
source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf
source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
CEPH_UTILS=${DRIVER_PATH}/../../datastore/ceph/ceph_utils.sh

4
src/tm_mad/ceph/snap_create_live
View File

@ -36,8 +36,8 @@ fi
DRIVER_PATH=$(dirname $0)
source $TMCOMMON
source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf
source ${DRIVER_PATH}/../../vmm/kvm/kvmrc
source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
source ${DRIVER_PATH}/../../etc/vmm/kvm/kvmrc
CEPH_UTILS=${DRIVER_PATH}/../../datastore/ceph/ceph_utils.sh

2
src/tm_mad/ceph/snap_delete
View File

@ -36,7 +36,7 @@ fi
DRIVER_PATH=$(dirname $0)
source $TMCOMMON
source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf
source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
CEPH_UTILS=${DRIVER_PATH}/../../datastore/ceph/ceph_utils.sh

2
src/tm_mad/ceph/snap_revert
View File

@ -36,7 +36,7 @@ fi
DRIVER_PATH=$(dirname $0)
source $TMCOMMON
source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf
source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
CEPH_UTILS=${DRIVER_PATH}/../../datastore/ceph/ceph_utils.sh

2
src/tm_mad/qcow2/snap_create_live
View File

@ -34,7 +34,7 @@ fi
DRIVER_PATH=$(dirname $0)
source $TMCOMMON
source ${DRIVER_PATH}/../../vmm/kvm/kvmrc
source ${DRIVER_PATH}/../../etc/vmm/kvm/kvmrc
SRC_PATH=$(arg_path $SRC)
SRC_HOST=$(arg_host $SRC)

2
src/vmm_mad/remotes/kvm/attach_disk
View File

@ -16,7 +16,7 @@
# limitations under the License. #
#--------------------------------------------------------------------------- #
source $(dirname $0)/kvmrc
source $(dirname $0)/../../etc/vmm/kvm/kvmrc
source $(dirname $0)/../../scripts_common.sh
DEFAULT_TYPE="raw"

2
src/vmm_mad/remotes/kvm/attach_nic
View File

@ -16,7 +16,7 @@
# limitations under the License. #
#--------------------------------------------------------------------------- #
source $(dirname $0)/kvmrc
source $(dirname $0)/../../etc/vmm/kvm/kvmrc
source $(dirname $0)/../../scripts_common.sh
DOMAIN=$1

2
src/vmm_mad/remotes/kvm/cancel
View File

@ -16,7 +16,7 @@
# limitations under the License. #
#--------------------------------------------------------------------------- #
source $(dirname $0)/kvmrc
source $(dirname $0)/../../etc/vmm/kvm/kvmrc
source $(dirname $0)/../../scripts_common.sh
deploy_id=$1

2
src/vmm_mad/remotes/kvm/deploy
View File

@ -16,7 +16,7 @@
# limitations under the License. #
#--------------------------------------------------------------------------- #
source $(dirname $0)/kvmrc
source $(dirname $0)/../../etc/vmm/kvm/kvmrc
source $(dirname $0)/../../scripts_common.sh
domain=$1

2
src/vmm_mad/remotes/kvm/detach_disk
View File

@ -16,7 +16,7 @@
# limitations under the License. #
#--------------------------------------------------------------------------- #
source $(dirname $0)/kvmrc
source $(dirname $0)/../../etc/vmm/kvm/kvmrc
source $(dirname $0)/../../scripts_common.sh
DOMAIN="$1"

2
src/vmm_mad/remotes/kvm/detach_nic
View File

@ -16,7 +16,7 @@
# limitations under the License. #
#--------------------------------------------------------------------------- #
source $(dirname $0)/kvmrc
source $(dirname $0)/../../etc/vmm/kvm/kvmrc
source $(dirname $0)/../../scripts_common.sh
DOMAIN=$1

2
src/vmm_mad/remotes/kvm/migrate
View File

@ -16,7 +16,7 @@
# limitations under the License. #
#--------------------------------------------------------------------------- #
source $(dirname $0)/kvmrc
source $(dirname $0)/../../etc/vmm/kvm/kvmrc
source $(dirname $0)/../../scripts_common.sh
deploy_id=$1

2
src/vmm_mad/remotes/kvm/migrate_local
View File

@ -16,7 +16,7 @@
# limitations under the License. #
#--------------------------------------------------------------------------- #
source $(dirname $0)/kvmrc
source $(dirname $0)/../../etc/vmm/kvm/kvmrc
source $(dirname $0)/../../scripts_common.sh
deploy_id=$1

2
src/vmm_mad/remotes/kvm/poll
View File

@ -520,7 +520,7 @@ end
################################################################################
hypervisor = KVM
file = 'kvmrc'
file = '../../etc/vmm/kvm/kvmrc'
vars = %w{LIBVIRT_URI}
load_vars(hypervisor, file, vars)

2
src/vmm_mad/remotes/kvm/prereconfigure
View File

@ -16,7 +16,7 @@
# limitations under the License. #
#--------------------------------------------------------------------------- #
source $(dirname $0)/kvmrc
source $(dirname $0)/../../etc/vmm/kvm/kvmrc
source $(dirname $0)/../../scripts_common.sh
DOMAIN=$1

2
src/vmm_mad/remotes/kvm/reboot
View File

@ -16,7 +16,7 @@
# limitations under the License. #
#--------------------------------------------------------------------------- #
source $(dirname $0)/kvmrc
source $(dirname $0)/../../etc/vmm/kvm/kvmrc
source $(dirname $0)/../../scripts_common.sh
deploy_id=$1

2
src/vmm_mad/remotes/kvm/reconfigure
View File

@ -16,7 +16,7 @@
# limitations under the License. #
#--------------------------------------------------------------------------- #
source $(dirname $0)/kvmrc
source $(dirname $0)/../../etc/vmm/kvm/kvmrc
source $(dirname $0)/../../scripts_common.sh
DOMAIN=$1

2
src/vmm_mad/remotes/kvm/reset
View File

@ -16,7 +16,7 @@
# limitations under the License. #
#--------------------------------------------------------------------------- #
source $(dirname $0)/kvmrc
source $(dirname $0)/../../etc/vmm/kvm/kvmrc
source $(dirname $0)/../../scripts_common.sh
deploy_id=$1

2
src/vmm_mad/remotes/kvm/resize_disk
View File

@ -21,7 +21,7 @@ DISK_ID=$2
DISK_SIZE=$3
DRV_ACTION=$4
source $(dirname $0)/kvmrc
source $(dirname $0)/../../etc/vmm/kvm/kvmrc
source $(dirname $0)/../../scripts_common.sh
(

2
src/vmm_mad/remotes/kvm/restore
View File

@ -18,7 +18,7 @@
DRIVER_PATH=$(dirname $0)
source $DRIVER_PATH/kvmrc
source $DRIVER_PATH/../../etc/vmm/kvm/kvmrc
source $DRIVER_PATH/../../scripts_common.sh
FILE=$1

4
src/vmm_mad/remotes/kvm/restore.ceph
View File

@ -18,7 +18,7 @@
DRIVER_PATH=$(dirname $0)
source $DRIVER_PATH/kvmrc
source $DRIVER_PATH/../../etc/vmm/kvm/kvmrc
source $DRIVER_PATH/../../scripts_common.sh
FILE=$1
@ -32,7 +32,7 @@ DS_ID=$5
# Ceph
#-------------------------------------------------------------------------------
source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf
source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"

2
src/vmm_mad/remotes/kvm/save
View File

@ -18,7 +18,7 @@
DRIVER_PATH=$(dirname $0)
source $DRIVER_PATH/kvmrc
source $DRIVER_PATH/../../etc/vmm/kvm/kvmrc
source $DRIVER_PATH/../../scripts_common.sh
DEPLOY_ID=$1

4
src/vmm_mad/remotes/kvm/save.ceph
View File

@ -18,7 +18,7 @@
DRIVER_PATH=$(dirname $0)
source $DRIVER_PATH/kvmrc
source $DRIVER_PATH/../../etc/vmm/kvm/kvmrc
source $DRIVER_PATH/../../scripts_common.sh
DEPLOY_ID=$1
@ -29,7 +29,7 @@ DS_ID=$5
#-------------------------------------------------------------------------------
source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf
source ${DRIVER_PATH}/../../etc/datastore/ceph/ceph.conf
XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"

2
src/vmm_mad/remotes/kvm/shutdown
View File

@ -16,7 +16,7 @@
# limitations under the License. #
#--------------------------------------------------------------------------- #
source $(dirname $0)/kvmrc
source $(dirname $0)/../../etc/vmm/kvm/kvmrc
source $(dirname $0)/../../scripts_common.sh
count=0

2
src/vmm_mad/remotes/kvm/snapshot_create
View File

@ -16,7 +16,7 @@
# limitations under the License. #
#--------------------------------------------------------------------------- #
source $(dirname $0)/kvmrc
source $(dirname $0)/../../etc/vmm/kvm/kvmrc
source $(dirname $0)/../../scripts_common.sh
DOMAIN="$1"

2
src/vmm_mad/remotes/kvm/snapshot_delete
View File

@ -16,7 +16,7 @@
# limitations under the License. #
#--------------------------------------------------------------------------- #
source $(dirname $0)/kvmrc
source $(dirname $0)/../../etc/vmm/kvm/kvmrc
source $(dirname $0)/../../scripts_common.sh
DOMAIN="$1"

2
src/vmm_mad/remotes/kvm/snapshot_revert
View File

@ -16,7 +16,7 @@
# limitations under the License. #
#--------------------------------------------------------------------------- #
source $(dirname $0)/kvmrc
source $(dirname $0)/../../etc/vmm/kvm/kvmrc
source $(dirname $0)/../../scripts_common.sh
DOMAIN="$1"

5
src/vnm_mad/remotes/lib/vnmmad.rb
View File

@ -37,9 +37,8 @@ Dir[File.expand_path('vnmmad-load.d', File.dirname(__FILE__)) + "/*.rb"].each{ |
include OpenNebula
begin
CONF = YAML.load_file(
File.join(File.dirname(__FILE__), "OpenNebulaNetwork.conf")
)
NAME = File.join(File.dirname(__FILE__), "../etc/vnm/OpenNebulaNetwork.conf")
CONF = YAML.load_file(NAME)
rescue
# Default configuration values
CONF = {