Skip to content
This repository has been archived by the owner on Nov 9, 2020. It is now read-only.

Fixing clean-esx util to accommodate log config changes for vDVS driver #1600

Merged
merged 1 commit into from
Jul 18, 2017
Merged

Fixing clean-esx util to accommodate log config changes for vDVS driver #1600

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions misc/scripts/deploy-tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ VMDK_OPS_UNITTEST=/tmp/vmdk_ops_unit*
BUILD_LOC=$TMP_LOC/build
PLUGIN_LOC=$TMP_LOC/plugin_dockerbuild
COMMON_VARS="../Commonvars.mk"
VMDK_OPS_CONFIG=/etc/vmware/vmdkops/log_config.json

# VM Functions

Expand Down Expand Up @@ -137,7 +138,6 @@ function deployesx {
do
TARGET=root@$ip
log "Deploying to ESX $TARGET"
$SSH $TARGET rm -f /etc/vmware/vmdkops/log_config.json
deployESXPre
deployESXInstall
deployESXPost
Expand Down Expand Up @@ -210,10 +210,8 @@ function cleanesx {
log "cleanesx: Failed to clean up resource groups!"
exit 1
fi
$SSH $TARGET "$RM_RF $TMP_LOC"
$SSH $TARGET "$RM_RF $VMDK_OPS_UNITTEST"
$SSH $TARGET "$RM_RF $TMP_LOC $VMDK_OPS_UNITTEST $VMDK_OPS_CONFIG"
done
rm -f /etc/vmware/vmdkops/log_config.json
}

# cleanvm
Expand Down