diff --git a/install.sh b/install.sh index 4f14ad725a..d549afeb3c 100755 --- a/install.sh +++ b/install.sh @@ -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 \ diff --git a/src/datastore_mad/remotes/ceph/clone b/src/datastore_mad/remotes/ceph/clone index df12b1b874..8107813bab 100755 --- a/src/datastore_mad/remotes/ceph/clone +++ b/src/datastore_mad/remotes/ceph/clone @@ -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 ------------ diff --git a/src/datastore_mad/remotes/ceph/cp b/src/datastore_mad/remotes/ceph/cp index 5793fe3899..acd94d9cbd 100755 --- a/src/datastore_mad/remotes/ceph/cp +++ b/src/datastore_mad/remotes/ceph/cp @@ -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 ------------ diff --git a/src/datastore_mad/remotes/ceph/export b/src/datastore_mad/remotes/ceph/export index c8697ee4db..10c4f1908d 100755 --- a/src/datastore_mad/remotes/ceph/export +++ b/src/datastore_mad/remotes/ceph/export @@ -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 ------------ diff --git a/src/datastore_mad/remotes/ceph/mkfs b/src/datastore_mad/remotes/ceph/mkfs index 4b773eabc7..74cf39cfcb 100755 --- a/src/datastore_mad/remotes/ceph/mkfs +++ b/src/datastore_mad/remotes/ceph/mkfs @@ -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 ------------ diff --git a/src/datastore_mad/remotes/ceph/monitor b/src/datastore_mad/remotes/ceph/monitor index bd79cfce80..e62a75187c 100755 --- a/src/datastore_mad/remotes/ceph/monitor +++ b/src/datastore_mad/remotes/ceph/monitor @@ -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 ------------ diff --git a/src/datastore_mad/remotes/ceph/rm b/src/datastore_mad/remotes/ceph/rm index 5b7dc5c9a6..bdbfb89246 100755 --- a/src/datastore_mad/remotes/ceph/rm +++ b/src/datastore_mad/remotes/ceph/rm @@ -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 ------------ diff --git a/src/datastore_mad/remotes/ceph/snap_delete b/src/datastore_mad/remotes/ceph/snap_delete index 30ec69c5ab..0147e1884b 100755 --- a/src/datastore_mad/remotes/ceph/snap_delete +++ b/src/datastore_mad/remotes/ceph/snap_delete @@ -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 ------------ diff --git a/src/datastore_mad/remotes/ceph/snap_flatten b/src/datastore_mad/remotes/ceph/snap_flatten index 15fb42eaba..b4a102b13a 100755 --- a/src/datastore_mad/remotes/ceph/snap_flatten +++ b/src/datastore_mad/remotes/ceph/snap_flatten @@ -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 ------------ diff --git a/src/datastore_mad/remotes/ceph/snap_revert b/src/datastore_mad/remotes/ceph/snap_revert index 1a4708759e..ffedded537 100755 --- a/src/datastore_mad/remotes/ceph/snap_revert +++ b/src/datastore_mad/remotes/ceph/snap_revert @@ -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 ------------ diff --git a/src/im_mad/remotes/kvm-probes.d/pci.conf b/src/im_mad/remotes/kvm-probes.d/pci.conf new file mode 100644 index 0000000000..e36881c3ee --- /dev/null +++ b/src/im_mad/remotes/kvm-probes.d/pci.conf @@ -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 []:[][:] +# 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: [] diff --git a/src/im_mad/remotes/kvm-probes.d/pci.rb b/src/im_mad/remotes/kvm-probes.d/pci.rb index 7b8ea73e26..a8810513f7 100755 --- a/src/im_mad/remotes/kvm-probes.d/pci.rb +++ b/src/im_mad/remotes/kvm-probes.d/pci.rb @@ -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 []:[] -# -# 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 diff --git a/src/tm_mad/ceph/clone b/src/tm_mad/ceph/clone index 6cfcf63a22..741e903324 100755 --- a/src/tm_mad/ceph/clone +++ b/src/tm_mad/ceph/clone @@ -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 diff --git a/src/tm_mad/ceph/cpds b/src/tm_mad/ceph/cpds index a04da8a1a7..1042282177 100755 --- a/src/tm_mad/ceph/cpds +++ b/src/tm_mad/ceph/cpds @@ -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 diff --git a/src/tm_mad/ceph/delete b/src/tm_mad/ceph/delete index 18d51d6edf..ac139638fe 100755 --- a/src/tm_mad/ceph/delete +++ b/src/tm_mad/ceph/delete @@ -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 diff --git a/src/tm_mad/ceph/ln b/src/tm_mad/ceph/ln index f83cbb1445..6b8aaab5b4 100755 --- a/src/tm_mad/ceph/ln +++ b/src/tm_mad/ceph/ln @@ -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 diff --git a/src/tm_mad/ceph/mkimage b/src/tm_mad/ceph/mkimage index b314ec3fda..a24b7c159a 100755 --- a/src/tm_mad/ceph/mkimage +++ b/src/tm_mad/ceph/mkimage @@ -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 diff --git a/src/tm_mad/ceph/monitor b/src/tm_mad/ceph/monitor index 7a0aeec97b..8ebfc70a17 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}/../../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 ------------ diff --git a/src/tm_mad/ceph/mvds b/src/tm_mad/ceph/mvds index 6366d07854..a2dbfb3f29 100755 --- a/src/tm_mad/ceph/mvds +++ b/src/tm_mad/ceph/mvds @@ -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 diff --git a/src/tm_mad/ceph/resize b/src/tm_mad/ceph/resize index 04ab65dda6..3d949d3ff6 100755 --- a/src/tm_mad/ceph/resize +++ b/src/tm_mad/ceph/resize @@ -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 diff --git a/src/tm_mad/ceph/snap_create b/src/tm_mad/ceph/snap_create index 7f3e844d8e..7cbb7d6879 100755 --- a/src/tm_mad/ceph/snap_create +++ b/src/tm_mad/ceph/snap_create @@ -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 diff --git a/src/tm_mad/ceph/snap_create_live b/src/tm_mad/ceph/snap_create_live index b8865de78b..1ca2ab04f1 100755 --- a/src/tm_mad/ceph/snap_create_live +++ b/src/tm_mad/ceph/snap_create_live @@ -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 diff --git a/src/tm_mad/ceph/snap_delete b/src/tm_mad/ceph/snap_delete index 8cf1828855..eaa7f02c67 100755 --- a/src/tm_mad/ceph/snap_delete +++ b/src/tm_mad/ceph/snap_delete @@ -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 diff --git a/src/tm_mad/ceph/snap_revert b/src/tm_mad/ceph/snap_revert index 4aa8d91f35..2029c688c7 100755 --- a/src/tm_mad/ceph/snap_revert +++ b/src/tm_mad/ceph/snap_revert @@ -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 diff --git a/src/tm_mad/qcow2/snap_create_live b/src/tm_mad/qcow2/snap_create_live index 72f0d60d14..38c7804c93 100755 --- a/src/tm_mad/qcow2/snap_create_live +++ b/src/tm_mad/qcow2/snap_create_live @@ -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) diff --git a/src/vmm_mad/remotes/kvm/attach_disk b/src/vmm_mad/remotes/kvm/attach_disk index c5c0af777f..37c3e2a554 100755 --- a/src/vmm_mad/remotes/kvm/attach_disk +++ b/src/vmm_mad/remotes/kvm/attach_disk @@ -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" diff --git a/src/vmm_mad/remotes/kvm/attach_nic b/src/vmm_mad/remotes/kvm/attach_nic index 6d24e99fdc..2b7f362b63 100755 --- a/src/vmm_mad/remotes/kvm/attach_nic +++ b/src/vmm_mad/remotes/kvm/attach_nic @@ -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 diff --git a/src/vmm_mad/remotes/kvm/cancel b/src/vmm_mad/remotes/kvm/cancel index b698687d8b..d494c57359 100755 --- a/src/vmm_mad/remotes/kvm/cancel +++ b/src/vmm_mad/remotes/kvm/cancel @@ -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 diff --git a/src/vmm_mad/remotes/kvm/deploy b/src/vmm_mad/remotes/kvm/deploy index 02b6896e43..8ed13b4480 100755 --- a/src/vmm_mad/remotes/kvm/deploy +++ b/src/vmm_mad/remotes/kvm/deploy @@ -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 diff --git a/src/vmm_mad/remotes/kvm/detach_disk b/src/vmm_mad/remotes/kvm/detach_disk index 3ab898702b..ec641d22c5 100755 --- a/src/vmm_mad/remotes/kvm/detach_disk +++ b/src/vmm_mad/remotes/kvm/detach_disk @@ -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" diff --git a/src/vmm_mad/remotes/kvm/detach_nic b/src/vmm_mad/remotes/kvm/detach_nic index 350bc9b37f..fcef8787d0 100755 --- a/src/vmm_mad/remotes/kvm/detach_nic +++ b/src/vmm_mad/remotes/kvm/detach_nic @@ -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 diff --git a/src/vmm_mad/remotes/kvm/migrate b/src/vmm_mad/remotes/kvm/migrate index 1b53000c35..fb30c5e08f 100755 --- a/src/vmm_mad/remotes/kvm/migrate +++ b/src/vmm_mad/remotes/kvm/migrate @@ -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 diff --git a/src/vmm_mad/remotes/kvm/migrate_local b/src/vmm_mad/remotes/kvm/migrate_local index a4b7bf6bb2..32ef4f3667 100755 --- a/src/vmm_mad/remotes/kvm/migrate_local +++ b/src/vmm_mad/remotes/kvm/migrate_local @@ -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 diff --git a/src/vmm_mad/remotes/kvm/poll b/src/vmm_mad/remotes/kvm/poll index 5a65fd2470..51bb28e4ba 100755 --- a/src/vmm_mad/remotes/kvm/poll +++ b/src/vmm_mad/remotes/kvm/poll @@ -520,7 +520,7 @@ end ################################################################################ hypervisor = KVM -file = 'kvmrc' +file = '../../etc/vmm/kvm/kvmrc' vars = %w{LIBVIRT_URI} load_vars(hypervisor, file, vars) diff --git a/src/vmm_mad/remotes/kvm/prereconfigure b/src/vmm_mad/remotes/kvm/prereconfigure index adcb7bc0bf..7562024db9 100755 --- a/src/vmm_mad/remotes/kvm/prereconfigure +++ b/src/vmm_mad/remotes/kvm/prereconfigure @@ -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 diff --git a/src/vmm_mad/remotes/kvm/reboot b/src/vmm_mad/remotes/kvm/reboot index 0e127ff836..cbce134e0c 100755 --- a/src/vmm_mad/remotes/kvm/reboot +++ b/src/vmm_mad/remotes/kvm/reboot @@ -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 diff --git a/src/vmm_mad/remotes/kvm/reconfigure b/src/vmm_mad/remotes/kvm/reconfigure index acd3463a2b..b42d0521af 100755 --- a/src/vmm_mad/remotes/kvm/reconfigure +++ b/src/vmm_mad/remotes/kvm/reconfigure @@ -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 diff --git a/src/vmm_mad/remotes/kvm/reset b/src/vmm_mad/remotes/kvm/reset index e8d30dfcd9..39b2df6cd6 100755 --- a/src/vmm_mad/remotes/kvm/reset +++ b/src/vmm_mad/remotes/kvm/reset @@ -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 diff --git a/src/vmm_mad/remotes/kvm/resize_disk b/src/vmm_mad/remotes/kvm/resize_disk index 0c5ea38f40..8631b07aa1 100755 --- a/src/vmm_mad/remotes/kvm/resize_disk +++ b/src/vmm_mad/remotes/kvm/resize_disk @@ -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 ( diff --git a/src/vmm_mad/remotes/kvm/restore b/src/vmm_mad/remotes/kvm/restore index ff291cf63a..531b4db580 100755 --- a/src/vmm_mad/remotes/kvm/restore +++ b/src/vmm_mad/remotes/kvm/restore @@ -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 diff --git a/src/vmm_mad/remotes/kvm/restore.ceph b/src/vmm_mad/remotes/kvm/restore.ceph index 0c8593d522..f7dcd427e0 100755 --- a/src/vmm_mad/remotes/kvm/restore.ceph +++ b/src/vmm_mad/remotes/kvm/restore.ceph @@ -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" diff --git a/src/vmm_mad/remotes/kvm/save b/src/vmm_mad/remotes/kvm/save index ebae3bb793..084c0ab657 100755 --- a/src/vmm_mad/remotes/kvm/save +++ b/src/vmm_mad/remotes/kvm/save @@ -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 diff --git a/src/vmm_mad/remotes/kvm/save.ceph b/src/vmm_mad/remotes/kvm/save.ceph index 3991587daf..ca03be89da 100755 --- a/src/vmm_mad/remotes/kvm/save.ceph +++ b/src/vmm_mad/remotes/kvm/save.ceph @@ -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" diff --git a/src/vmm_mad/remotes/kvm/shutdown b/src/vmm_mad/remotes/kvm/shutdown index 0f03b4f0ed..8ed50fdcde 100755 --- a/src/vmm_mad/remotes/kvm/shutdown +++ b/src/vmm_mad/remotes/kvm/shutdown @@ -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 diff --git a/src/vmm_mad/remotes/kvm/snapshot_create b/src/vmm_mad/remotes/kvm/snapshot_create index dda6ea610d..bd7bd2d9e9 100755 --- a/src/vmm_mad/remotes/kvm/snapshot_create +++ b/src/vmm_mad/remotes/kvm/snapshot_create @@ -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" diff --git a/src/vmm_mad/remotes/kvm/snapshot_delete b/src/vmm_mad/remotes/kvm/snapshot_delete index 4b384c0fc0..b0cb126085 100755 --- a/src/vmm_mad/remotes/kvm/snapshot_delete +++ b/src/vmm_mad/remotes/kvm/snapshot_delete @@ -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" diff --git a/src/vmm_mad/remotes/kvm/snapshot_revert b/src/vmm_mad/remotes/kvm/snapshot_revert index 8768d5eecf..f00c820759 100755 --- a/src/vmm_mad/remotes/kvm/snapshot_revert +++ b/src/vmm_mad/remotes/kvm/snapshot_revert @@ -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" diff --git a/src/vnm_mad/remotes/lib/vnmmad.rb b/src/vnm_mad/remotes/lib/vnmmad.rb index 3195d81038..d35cb05661 100644 --- a/src/vnm_mad/remotes/lib/vnmmad.rb +++ b/src/vnm_mad/remotes/lib/vnmmad.rb @@ -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 = {