diff --git a/install.sh b/install.sh index 78319c2571e..3b558f26823 100755 --- a/install.sh +++ b/install.sh @@ -278,6 +278,7 @@ LIB_DIRS="$LIB_LOCATION/ruby \ VAR_DIRS="$VAR_LOCATION/remotes \ $VAR_LOCATION/remotes/etc \ $VAR_LOCATION/remotes/etc/tm/fs_lvm \ + $VAR_LOCATION/remotes/etc/tm/ssh \ $VAR_LOCATION/remotes/etc/datastore/fs \ $VAR_LOCATION/remotes/etc/datastore/ceph \ $VAR_LOCATION/remotes/etc/im/kvm-probes.d \ @@ -602,6 +603,7 @@ INSTALL_FILES=( TM_FS_LVM_ETC_FILES:$VAR_LOCATION/remotes/etc/tm/fs_lvm/fs_lvm.conf TM_QCOW2_FILES:$VAR_LOCATION/remotes/tm/qcow2 TM_SSH_FILES:$VAR_LOCATION/remotes/tm/ssh + TM_SSH_ETC_FILES:$VAR_LOCATION/remotes/etc/tm/ssh TM_CEPH_FILES:$VAR_LOCATION/remotes/tm/ceph TM_DEV_FILES:$VAR_LOCATION/remotes/tm/dev TM_ISCSI_FILES:$VAR_LOCATION/remotes/tm/iscsi_libvirt @@ -1673,6 +1675,8 @@ TM_SSH_FILES="src/tm_mad/ssh/clone \ src/tm_mad/ssh/cpds \ src/tm_mad/ssh/resize" +TM_SSH_ETC_FILES="src/tm_mad/ssh/sshrc" + TM_DUMMY_FILES="src/tm_mad/dummy/clone \ src/tm_mad/dummy/delete \ src/tm_mad/dummy/ln \ diff --git a/src/tm_mad/ssh/clone.replica b/src/tm_mad/ssh/clone.replica index 8fe52597da9..1a753c854ff 100755 --- a/src/tm_mad/ssh/clone.replica +++ b/src/tm_mad/ssh/clone.replica @@ -35,10 +35,10 @@ REPLICA_HOST=$5 if [ -z "${ONE_LOCATION}" ]; then TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh - SSH_RC=/var/lib/one/remotes/tm/ssh/sshrc + SSH_RC=/var/lib/one/remotes/etc/tm/ssh/sshrc else TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh - SSH_RC=$ONE_LOCATION/var/remotes/tm/ssh/sshrc + SSH_RC=$ONE_LOCATION/var/remotes/etc/tm/ssh/sshrc fi . $TMCOMMON diff --git a/src/tm_mad/ssh/snap_create b/src/tm_mad/ssh/snap_create index 031a85aedc2..b6767da2a93 100755 --- a/src/tm_mad/ssh/snap_create +++ b/src/tm_mad/ssh/snap_create @@ -24,10 +24,10 @@ VMID=$3 if [ -z "${ONE_LOCATION}" ]; then TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh - SSH_RC=/var/lib/one/remotes/tm/ssh/sshrc + SSH_RC=/var/lib/one/remotes/etc/tm/ssh/sshrc else TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh - SSH_RC=$ONE_LOCATION/var/remotes/tm/ssh/sshrc + SSH_RC=$ONE_LOCATION/var/remotes/etc/tm/ssh/sshrc fi DRIVER_PATH=$(dirname $0) diff --git a/src/tm_mad/ssh/snap_create_live b/src/tm_mad/ssh/snap_create_live index bb803ac0119..c11adb7ef84 100755 --- a/src/tm_mad/ssh/snap_create_live +++ b/src/tm_mad/ssh/snap_create_live @@ -24,10 +24,10 @@ VMID=$3 if [ -z "${ONE_LOCATION}" ]; then TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh - SSH_RC=/var/lib/one/remotes/tm/ssh/sshrc + SSH_RC=/var/lib/one/remotes/etc/tm/ssh/sshrc else TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh - SSH_RC=$ONE_LOCATION/var/remotes/tm/ssh/sshrc + SSH_RC=$ONE_LOCATION/var/remotes/etc/tm/ssh/sshrc fi DRIVER_PATH=$(dirname $0)