diff --git a/defaults.inc b/defaults.inc index d1fc75de..d4620aa4 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.5.226-01312024' +VERS='2.5.227-01312024' noheader=' update service dailytemp confsync -r -report ' diff --git a/esxi-scripts/iscsi-all-shutdown-verify.ps1 b/esxi-scripts/iscsi-all-shutdown-verify.ps1 index 4105a8c8..0e7106dc 100755 --- a/esxi-scripts/iscsi-all-shutdown-verify.ps1 +++ b/esxi-scripts/iscsi-all-shutdown-verify.ps1 @@ -4,23 +4,22 @@ Connect-VIServer -Server $VCENTERHOST -Protocol https -User $VCENTERUSER -Password $VCENTERPASS | Out-Null Do { - $VMLIST = Get-Datastore | Where {$_.Name -like '*iSCSI-*'} | Get-VM - write-host $VMLIST + $VMLIST = Get-Datastore | Where {$_.Name -like '*iSCSI-*' -and $_.Name -notlike '*vMS*'} | Get-VM if ($VMLIST -ne $null) { - write-host "cycling through iscsi vms found" $poff = 'no' Foreach ($VM in $VMLIST) { $VMI = Get-VM $VM - if ($VMI -eq $null -Or $VMI.PowerState -match 'PoweredOn') { - $poff = 'no' - break - } else { - $poff = 'yes' - } + if ($VMI.Name -notlike '*CLS*' -and $VMI.Name -notlike '*iSCSI-*') { + if ($VMI -eq $null -Or $VMI.PowerState -match 'PoweredOn') { + $poff = 'no' + break + } else { + $poff = 'yes' + } + } } Start-Sleep -s 1 } else { - write-host "no iscsi vms found" $poff = 'yes' } } Until ($poff -match 'yes') diff --git a/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1 b/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1 index efdec6a1..baf97c4d 100755 --- a/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1 +++ b/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1 @@ -5,9 +5,7 @@ Connect-VIServer -Server $VCENTERHOST -Protocol https -User $VCENTERUSER -Passwo Do { $VMLIST = Get-Datastore | Where {$_.Name -like '*iSCSI-SYS*'} | Get-VM - write-host $VMLIST if ($VMLIST -ne $null) { - write-host "cycling through iscsi vms found" $poff = 'no' Foreach ($VM in $VMLIST) { $VMI = Get-VM $VM @@ -20,7 +18,6 @@ Do { } Start-Sleep -s 1 } else { - write-host "no iscsi vms found" $poff = 'yes' } } Until ($poff -match 'yes') diff --git a/esxi-scripts/iscsi-vm-shutdown-verify.ps1 b/esxi-scripts/iscsi-vm-shutdown-verify.ps1 index d2c97175..961cdd9a 100755 --- a/esxi-scripts/iscsi-vm-shutdown-verify.ps1 +++ b/esxi-scripts/iscsi-vm-shutdown-verify.ps1 @@ -5,9 +5,7 @@ Connect-VIServer -Server $VCENTERHOST -Protocol https -User $VCENTERUSER -Passwo Do { $VMLIST = Get-Datastore | Where {$_.Name -like '*iSCSI-PRI*'} | Get-VM - write-host $VMLIST if ($VMLIST -ne $null) { - write-host "cycling through iscsi vms found" $poff = 'no' Foreach ($VM in $VMLIST) { $VMI = Get-VM $VM @@ -20,7 +18,6 @@ Do { } Start-Sleep -s 1 } else { - write-host "no iscsi vms found" $poff = 'yes' } } Until ($poff -match 'yes') diff --git a/esxi-scripts/sys-suspend.ps1 b/esxi-scripts/sys-suspend.ps1 index 05dc4401..d4ff3c17 100755 --- a/esxi-scripts/sys-suspend.ps1 +++ b/esxi-scripts/sys-suspend.ps1 @@ -1,6 +1,6 @@ #!/usr/bin/env pwsh -Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false | Out-Null +# Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false | Out-Null . /opt/idssys/powerwall/settings.ps1 Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null diff --git a/esxi-scripts/vm-shutdown-verify.ps1 b/esxi-scripts/vm-shutdown-verify.ps1 index 01848dd8..cc934932 100755 --- a/esxi-scripts/vm-shutdown-verify.ps1 +++ b/esxi-scripts/vm-shutdown-verify.ps1 @@ -1,15 +1,13 @@ #!/usr/bin/env pwsh - -Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false | Out-Null . /opt/idssys/powerwall/settings.ps1 +# Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false | Out-Null + Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null Do { $VMLIST = Get-VM | Where {$_.PowerState -like '*On*' -and $_.Name -notlike '*CLS*' -and $_.Name -notlike '*iSCSI*'} - write-host $VMLIST if ($VMLIST -ne $null) { - write-host "cycling through iscsi vms found" $poff = 'no' Foreach ($VM in $VMLIST) { $VMI = Get-VM $VM @@ -22,10 +20,10 @@ Do { } Start-Sleep -s 1 } else { - write-host "no iscsi vms found" $poff = 'yes' } } Until ($poff -match 'yes') -Disconnect-VIServer -Server $args[0] -Force –Confirm:$false \ No newline at end of file +Disconnect-VIServer -Server $args[0] -Force –Confirm:$false +