fix comments and remove NuGet package

Author: Yarkrn

Management-Utilities/ec2-user-data-iscsi-create-and-mount/linux_userData.sh

@@ -23,7 +23,7 @@ LUN_NAME=${VOLUME_NAME}_$(($RANDOM%($max-$min+1)+$min))
 # defaults
 # The script will create a log file in the ec2-user home directory
 LOG_FILE=/home/ec2-user/install.log
-TIMEOUT=2
+TIMEOUT=5
 
 LUN_SIZE=$(bc -l <<< "0.90*$VOLUME_SIZE" )
 
@@ -241,6 +241,7 @@ fi
 
 addUndoCommand "curl -m $TIMEOUT -X DELETE -u \"$ONTAP_USER\":\"$FSXN_PASSWORD\" -k \"https://$FSXN_ADMIN_IP/api/protocols/san/lun-maps?lun.name=/vol/${VOLUME_NAME}/${LUN_NAME}&igroup.name=${groupName}&svm.name=${SVM_NAME}\""
 
+# The serial hex in needed for creating readable name for the block device.
 getLunSerialNumberResult=$(curl -m $TIMEOUT -X GET -u "$ONTAP_USER":"$FSXN_PASSWORD" -k "https://$FSXN_ADMIN_IP/api/storage/luns?fields=serial_number")
 serialNumber=$(echo "${getLunSerialNumberResult}" | jq -r '.records[] | select(.name == "'/vol/$VOLUME_NAME/$LUN_NAME'" ) | .serial_number')
 serialHex=$(echo -n "${serialNumber}" | xxd -p)
@@ -249,7 +250,6 @@ if [ -z "$serialHex" ]; then
     ./uninstall.sh
 fi
 
-# The serial hex in needed for creating readable name for the block device.
 logMessage "Get the iscsi interface addresses for the svm ${SVM_NAME}"
 getInterfacesResult=$(curl -m $TIMEOUT -X GET -u "$ONTAP_USER":"$FSXN_PASSWORD" -k "https://$FSXN_ADMIN_IP/api/network/ip/interfaces?svm.name=$SVM_NAME&fields=ip")
 iscsi1IP=$(echo "$getInterfacesResult" | jq -r '.records[] | select(.name == "iscsi_1") | .ip.address')

Management-Utilities/ec2-user-data-iscsi-create-and-mount/windows_userData.ps1

@@ -42,21 +42,12 @@ if(!(Get-Item $path -ErrorAction SilentlyContinue)) {
    New-ItemProperty -Path $path -Name $itemName -Value 0 -PropertyType dword
 }
 
-$runStep = Get-ItemProperty -Path $path -Name $itemName -ErrorAction SilentlyContinue | Select-Object -ExpandProperty $itemName
 Write-Output "Write-Host ""Uninstall FSxn configuration""" >> $uninstallFile
 Write-Output "# FSXn uninstall:" >> $uninstallFile
 
-if($runStep -eq 0) {
-   if (Get-Module | Where-Object {$_.Name -ne 'NuGet'}) {
-      Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force
-      @("Uninstall-PackageProvider -Name NuGet -Force") + (Get-Content $uninstallFile) | Set-Content $uninstallFile
-   }
-         Set-ItemProperty -Path $path -Name $itemName -Value 1
-}
-
 $runStep = Get-ItemProperty -Path $path -Name $itemName -ErrorAction SilentlyContinue | Select-Object -ExpandProperty $itemName
 
-if($runStep -eq 1) {
+if($runStep -eq 0) {
 
    ### Install MPIO ####
    Write-Output "Installing Multipath-IO windows feature" >> $currentLogPath 
@@ -72,7 +63,7 @@ if($runStep -eq 1) {
    else {
       # restart the instance after installing MPIO
       Install-WindowsFeature -name Multipath-IO -Restart 
-      @("Uninstall-PackageProvider -Name Multipath-IO -Force") + (Get-Content $uninstallFile) | Set-Content $uninstallFile   
+      @("Uninstall-WindowsFeature -Name Multipath-IO -Remove -Confirm:$false") + (Get-Content $uninstallFile) | Set-Content $uninstallFile   
    }
 
    $vol_number = get-random -Minimum 1 -Maximum 10000
@@ -352,7 +343,7 @@ if($runStep -eq 1) {
       Write-Host "Failed create new partition, due to: $_" -ForegroundColor Red  -ErrorAction stop
       break
    }
-   Set-ItemProperty -Path $path -Name $itemName -Value 2
+   Set-ItemProperty -Path $path -Name $itemName -Value 1
    Write-Output "Done creating new FSx disk, drive letter: $drive_letter" >> $currentLogPath 
    Write-Host "Done creating new FSx disk, drive letter: $drive_letter" -ForegroundColor Green
 }