adding automated deploy

azuredeploy.json

@@ -68,6 +68,10 @@
         "azureAdminPassword": {
             "type": "securestring"
         },
+        "autoConfigureAzureAD": {
+            "type": "bool",
+            "defaultValue": true
+        },
         "addressPrefix": {
             "type": "string",
             "defaultValue": "10.0.0.0/24",
@@ -145,6 +149,8 @@
         "subnetRef": "[concat(variables('vnetID'), '/subnets/', parameters('subnetName'))]",
         "scriptFileName": "post-config.ps1",
         "scriptPath": "https://raw.githubusercontent.com/ned1313/AzureStack-VM-PoC/master/scripts/",
+        "scriptDefaultArgs" : "[concat(variables('scriptFileName'), ' ', variables('adminUsername'), ' ', parameters('adminPassword'))]",
+        "scriptAzureADArgs" : "[concat(variables('scriptDefaultArgs'), ' ', parameters('azureAdminUsername'), ' ', parameters('azureAdminPassword')]",
         "fileUri": "[concat(variables('scriptPath'), variables('scriptFileName'))]",
         "adminUsername": "__administrator",
         "osDiskSizeinGB": 256,
@@ -231,7 +237,7 @@
                             "fileUris": [
                                 "[variables('fileUri')]"
                             ],
-                            "commandToExecute": "[concat('powershell.exe -ExecutionPolicy Unrestricted -File ', variables('scriptFileName'), ' ', variables('adminUsername'), ' ', parameters('adminPassword'), ' ', parameters('azureAdminUsername'), ' ', parameters('azureAdminPassword'))]"
+                            "commandToExecute": "[if(parameters('autoConfigureAzureAD'), concat('powershell.exe -ExecutionPolicy Unrestricted -File ', variables('scriptAzureADArgs')), concat('powershell.exe -ExecutionPolicy Unrestricted -File ', variables('scriptDefaultArgs')))]"
                         }
                     }
                 }

conditions.json

@@ -0,0 +1,18 @@
+{
+    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {
+        "testval" : {
+            "type": "bool",
+            "defaultValue": true
+        }
+    },
+    "resources": [
+    ],
+    "outputs": {
+        "yesOutput": {
+            "type": "string",
+            "value": "[if(parameters('testval'), 'yes', 'no')]"
+        }
+    }
+}

scripts/Install-ASDK.ps1

@@ -171,7 +171,7 @@ $aadTenant = $AadAdminUser.Split("@")[1]
 $localAdminCred = New-Object System.Management.Automation.PSCredential ($LocalAdminUsername, $localAdminPass)
 $aadcred = New-Object System.Management.Automation.PSCredential ($AadAdminUser, $AadPassword)
 
-Write-Log @writeLogParams -Message "Available ASDK versions found"
+#Write-Log @writeLogParams -Message "Available ASDK versions found"
 #Write-Log @writeLogParams -Message $versionArray
 
 <#if ($version -eq $null)
@@ -209,6 +209,12 @@ if ($Interactive -eq $true)
 
 #endregion
 
+#Remove scheduled job from post-config.ps1 if present
+if (Get-ScheduledJob -name "Install-ASDK" -ErrorAction SilentlyContinue)
+{
+    Get-ScheduledJob -name "Install-ASDK" | Unregister-ScheduledJob -Force
+}
+
 #Test if ASDK required folder already in the OS drive
 if ((Test-Path -Path ($foldersToCopy | ForEach-Object {Join-Path -Path $destPath -ChildPath $_})) -contains $false)
 {

scripts/post-config.ps1

@@ -62,11 +62,6 @@ Set-ExecutionPolicy unrestricted -Force
 #Download ASDK Downloader
 Invoke-WebRequest -Uri "https://aka.ms/azurestackdevkitdownloader" -OutFile "D:\AzureStackDownloader.exe"
 
-#Download and extract Mobaxterm
-Invoke-WebRequest -Uri "https://aka.ms/mobaxtermLatest" -OutFile "$defaultLocalPath\Mobaxterm.zip"
-Expand-Archive -Path "$defaultLocalPath\Mobaxterm.zip" -DestinationPath "$defaultLocalPath\Mobaxterm"
-Remove-Item -Path "$defaultLocalPath\Mobaxterm.zip" -Force
-
 #Install VS Code with ms-vscode.azure-account and msazurermtools.azurerm-vscode-tools
 Invoke-WebRequest -Uri https://raw.githubusercontent.com/PowerShell/vscode-powershell/master/scripts/Install-VSCode.ps1 -OutFile "$scriptsPath\Install-VSCode.ps1"
 Set-Location $scriptsPath
@@ -96,6 +91,7 @@ $argumentList = @{
 
 $trigger = New-ScheduledTaskTrigger -AtStartup -AsJob
 
-Register-ScheduledJob -Name "Install-ASDK" -FilePath $scriptsPath\Install-ASDK.ps1 -Trigger $trigger -ArgumentList $argumentList
+$st = Register-ScheduledJob -Name "Install-ASDK" -FilePath $scriptsPath\Install-ASDK.ps1 -Trigger $trigger -ArgumentList $argumentList
+#$st.StartJob()
 
 Add-WindowsFeature Hyper-V, Failover-Clustering, Web-Server -IncludeManagementTools -Restart