Add managed disks - change install script

2019-03-28 10:20:56 +01:00 · 2019-03-28 10:20:56 +01:00 · 71ee7b89ed
--- a/additional-install.cmd
+++ b/additional-install.cmd
@ -1,5 +0,0 @@
-@"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
-choco feature enable -n allowGlobalConfirmation
-choco install git --force
-choco install googlechrome --force
-
--- a/additional-install.ps1
+++ b/additional-install.ps1
@ -1,2 +1,26 @@
-(New-Object System.Net.WebClient).DownloadFile('https://raw.githubusercontent.com/Microsoft/nav-arm-templates/dev/additional-install.cmd', 'c:\demo\additional-install.cmd')
-& C:\demo\additional-install.cmd
+if (!(Test-Path function:Log)) {
+  function Log([string]$line, [string]$color = "Gray") {
+    ("<font color=""$color"">" + [DateTime]::Now.ToString([System.Globalization.DateTimeFormatInfo]::CurrentInfo.ShortTimePattern.replace(":mm",":mm:ss")) + " $line</font>") | Add-Content -Path "c:\demo\status.txt"
+    Write-Host -ForegroundColor $color $line 
+  }
+}
+
+#Install Choco
+Log "Install Choco"
+Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
+choco feature enable -n allowGlobalConfirmation
+
+Log "Install git"
+choco install git --force
+
+Log "Install Chrome"
+choco install googlechrome
+
+Log "Install firefox"
+choco install firefox
+
+#Add VSCode Extensions
+"eamodio.gitlens", "ms-vscode.PowerShell", "heaths.vscode-guid", "github.vscode-pull-request-github", "formulahendry.docker-explorer" | % {
+    Log "Install VSCode Extension: $_"
+    code --install-extension $_
+}
--- a/bcsandboxazure.json
+++ b/bcsandboxazure.json
@ -233,7 +233,7 @@
        "imageOffer": "[if(equals(variables('OperatingSystem'),'Windows 10'),'Windows-10','WindowsServer')]",
        "imageSku": "[if(equals(variables('OperatingSystem'),'Windows 10'),'rs5-pro',if(equals(variables('OperatingSystem'),'Windows Server 2016'),'2016-Datacenter',if(equals(variables('OperatingSystem'),'Windows Server 2019'),'2019-Datacenter','2019-Datacenter-with-containers')))]",
        "storageAccountType": "Standard_LRS",
-        "vmStorageAccountContainerName": "vhds",
+        "OSDiskName": "[concat(variables('vmName'),'_osdisk')]",
        "publicIPAddressName": "[concat(variables('vmName'), '_pip')]",
        "storageAccountName": "[concat('storage', uniqueString(resourceGroup().id))]",
        "networkSecurityGroupName": "networksecuritygroup",
@ -645,12 +645,14 @@
                        "version": "latest"
                    },
                    "osDisk": {
-                        "name": "osdisk",
-                        "vhd": {
-                            "uri": "[concat('http://',variables('storageAccountName'),'.blob.core.windows.net/',variables('vmStorageAccountContainerName'),'/',variables('server1Name'),'.vhd')]"
-                        },
+                        "createOption": "FromImage",
+                        "osType": "Windows",
+                        "name": "[variables('OSDiskName')]",
                        "caching": "ReadWrite",
-                        "createOption": "FromImage"
+                        "managedDisk": {
+                          "storageAccountType": "[variables('storageAccountType')]"
+                        },
+                        "diskSizeGB": 128
                    }
                },
                "networkProfile": {
--- a/bcsandboxazureext.json
+++ b/bcsandboxazureext.json
@ -324,7 +324,7 @@
        "imageOffer": "[if(equals(variables('OperatingSystem'),'Windows 10'),'Windows-10','WindowsServer')]",
        "imageSku": "[if(equals(variables('OperatingSystem'),'Windows 10'),'rs5-pro',if(equals(variables('OperatingSystem'),'Windows Server 2016'),'2016-Datacenter',if(equals(variables('OperatingSystem'),'Windows Server 2019'),'2019-Datacenter','2019-Datacenter-with-containers')))]",
        "storageAccountType": "[parameters('StorageAccountType')]",
-        "vmStorageAccountContainerName": "vhds",
+        "OSDiskName": "[concat(variables('vmName'),'_osdisk')]",
        "publicIPAddressName": "[concat(variables('vmName'), '_pip')]",
        "storageAccountName": "[concat('storage', uniqueString(resourceGroup().id))]",
        "networkSecurityGroupName": "networksecuritygroup",
@ -736,12 +736,14 @@
                        "version": "latest"
                    },
                    "osDisk": {
-                        "name": "osdisk",
-                        "vhd": {
-                            "uri": "[concat('http://',variables('storageAccountName'),'.blob.core.windows.net/',variables('vmStorageAccountContainerName'),'/',variables('server1Name'),'.vhd')]"
-                        },
+                        "createOption": "FromImage",
+                        "osType": "Windows",
+                        "name": "[variables('OSDiskName')]",
                        "caching": "ReadWrite",
-                        "createOption": "FromImage"
+                        "managedDisk": {
+                          "storageAccountType": "[variables('storageAccountType')]"
+                        },
+                        "diskSizeGB": 128
                    }
                },
                "networkProfile": {
--- a/dockeragent.json
+++ b/dockeragent.json
@ -368,13 +368,14 @@
                        "version": "latest"
                    },
                    "osDisk": {
-                        "name": "osdisk",
-                        "DiskSizeGB": 1023,
-                        "vhd": {
-                            "uri": "[concat('http://',variables('storageAccountName'),'.blob.core.windows.net/',variables('vmStorageAccountContainerName'),'/',variables('vmName'),'-',copyIndex(),'.vhd')]"
-                        },
+                        "createOption": "FromImage",
+                        "osType": "Windows",
+                        "name": "[[concat(variables('vmName'),'-',copyIndex(),'_osdisk')]",
                        "caching": "ReadWrite",
-                        "createOption": "FromImage"
+                        "managedDisk": {
+                          "storageAccountType": "[variables('storageAccountType')]"
+                        },
+                        "diskSizeGB": 1023
                    }
                },
                "networkProfile": {
--- a/getbc.json
+++ b/getbc.json
@ -227,7 +227,7 @@
        "imageOffer": "[if(equals(variables('OperatingSystem'),'Windows 10'),'Windows-10','WindowsServer')]",
        "imageSku": "[if(equals(variables('OperatingSystem'),'Windows 10'),'rs5-pro',if(equals(variables('OperatingSystem'),'Windows Server 2016'),'2016-Datacenter',if(equals(variables('OperatingSystem'),'Windows Server 2019'),'2019-Datacenter','2019-Datacenter-with-containers')))]",
        "storageAccountType": "Standard_LRS",
-        "vmStorageAccountContainerName": "vhds",
+        "OSDiskName": "[concat(variables('vmName'),'_osdisk')]",
        "publicIPAddressName": "[concat(variables('vmName'), '_pip')]",
        "storageAccountName": "[concat('storage', uniqueString(resourceGroup().id))]",
        "networkSecurityGroupName": "networksecuritygroup",
@ -639,12 +639,14 @@
                        "version": "latest"
                    },
                    "osDisk": {
-                        "name": "osdisk",
-                        "vhd": {
-                            "uri": "[concat('http://',variables('storageAccountName'),'.blob.core.windows.net/',variables('vmStorageAccountContainerName'),'/',variables('server1Name'),'.vhd')]"
-                        },
+                        "createOption": "FromImage",
+                        "osType": "Windows",
+                        "name": "[variables('OSDiskName')]",
                        "caching": "ReadWrite",
-                        "createOption": "FromImage"
+                        "managedDisk": {
+                          "storageAccountType": "[variables('storageAccountType')]"
+                        },
+                        "diskSizeGB": 128
                    }
                },
                "networkProfile": {
--- a/getnav.json
+++ b/getnav.json
@ -227,7 +227,7 @@
        "imageOffer": "[if(equals(variables('OperatingSystem'),'Windows 10'),'Windows-10','WindowsServer')]",
        "imageSku": "[if(equals(variables('OperatingSystem'),'Windows 10'),'rs5-pro',if(equals(variables('OperatingSystem'),'Windows Server 2016'),'2016-Datacenter',if(equals(variables('OperatingSystem'),'Windows Server 2019'),'2019-Datacenter','2019-Datacenter-with-containers')))]",
        "storageAccountType": "Standard_LRS",
-        "vmStorageAccountContainerName": "vhds",
+        "OSDiskName": "[concat(variables('vmName'),'_osdisk')]",
        "publicIPAddressName": "[concat(variables('vmName'), '_pip')]",
        "storageAccountName": "[concat('storage', uniqueString(resourceGroup().id))]",
        "networkSecurityGroupName": "networksecuritygroup",
@ -639,12 +639,14 @@
                        "version": "latest"
                    },
                    "osDisk": {
-                        "name": "osdisk",
-                        "vhd": {
-                            "uri": "[concat('http://',variables('storageAccountName'),'.blob.core.windows.net/',variables('vmStorageAccountContainerName'),'/',variables('server1Name'),'.vhd')]"
-                        },
+                        "createOption": "FromImage",
+                        "osType": "Windows",
+                        "name": "[variables('OSDiskName')]",
                        "caching": "ReadWrite",
-                        "createOption": "FromImage"
+                        "managedDisk": {
+                          "storageAccountType": "[variables('storageAccountType')]"
+                        },
+                        "diskSizeGB": 128
                    }
                },
                "networkProfile": {
--- a/getnavext.json
+++ b/getnavext.json
@ -332,7 +332,7 @@
        "imageOffer": "[if(equals(variables('OperatingSystem'),'Windows 10'),'Windows-10','WindowsServer')]",
        "imageSku": "[if(equals(variables('OperatingSystem'),'Windows 10'),'rs5-pro',if(equals(variables('OperatingSystem'),'Windows Server 2016'),'2016-Datacenter',if(equals(variables('OperatingSystem'),'Windows Server 2019'),'2019-Datacenter','2019-Datacenter-with-containers')))]",
        "storageAccountType": "[parameters('StorageAccountType')]",
-        "vmStorageAccountContainerName": "vhds",
+        "OSDiskName": "[concat(variables('vmName'),'_osdisk')]",
        "publicIPAddressName": "[concat(variables('vmName'), '_pip')]",
        "storageAccountName": "[concat('storage', uniqueString(resourceGroup().id))]",
        "networkSecurityGroupName": "networksecuritygroup",
@ -744,12 +744,14 @@
                        "version": "latest"
                    },
                    "osDisk": {
-                        "name": "osdisk",
-                        "vhd": {
-                            "uri": "[concat('http://',variables('storageAccountName'),'.blob.core.windows.net/',variables('vmStorageAccountContainerName'),'/',variables('server1Name'),'.vhd')]"
-                        },
+                        "createOption": "FromImage",
+                        "osType": "Windows",
+                        "name": "[variables('OSDiskName')]",
                        "caching": "ReadWrite",
-                        "createOption": "FromImage"
+                        "managedDisk": {
+                          "storageAccountType": "[variables('storageAccountType')]"
+                        },
+                        "diskSizeGB": 128
                    }
                },
                "networkProfile": {
--- a/getnavworkshopvms.json
+++ b/getnavworkshopvms.json
@ -235,7 +235,6 @@
        "imageOffer": "[if(equals(variables('OperatingSystem'),'Windows 10'),'Windows-10','WindowsServer')]",
        "imageSku": "[if(equals(variables('OperatingSystem'),'Windows 10'),'rs5-pro',if(equals(variables('OperatingSystem'),'Windows Server 2016'),'2016-Datacenter',if(equals(variables('OperatingSystem'),'Windows Server 2019'),'2019-Datacenter','2019-Datacenter-with-containers')))]",
        "storageAccountType": "[parameters('StorageAccountType')]",
-        "vmStorageAccountContainerName": "vhds",
        "storageAccountName": "[concat('storage', uniqueString(resourceGroup().id))]",
        "networkSecurityGroupName": "networksecuritygroup",
        "addressPrefix": "10.0.0.0/8",
--- a/navdeveloperpreview.json
+++ b/navdeveloperpreview.json
@ -204,7 +204,7 @@
        "imageOffer": "[if(equals(variables('OperatingSystem'),'Windows 10'),'Windows-10','WindowsServer')]",
        "imageSku": "[if(equals(variables('OperatingSystem'),'Windows 10'),'rs5-pro',if(equals(variables('OperatingSystem'),'Windows Server 2016'),'2016-Datacenter',if(equals(variables('OperatingSystem'),'Windows Server 2019'),'2019-Datacenter','2019-Datacenter-with-containers')))]",
        "storageAccountType": "Standard_LRS",
-        "vmStorageAccountContainerName": "vhds",
+        "OSDiskName": "[concat(variables('vmName'),'_osdisk')]",
        "publicIPAddressName": "[concat(variables('vmName'), '_pip')]",
        "storageAccountName": "[concat('storage', uniqueString(resourceGroup().id))]",
        "networkSecurityGroupName": "networksecuritygroup",
@ -616,12 +616,14 @@
                        "version": "latest"
                    },
                    "osDisk": {
-                        "name": "osdisk",
-                        "vhd": {
-                            "uri": "[concat('http://',variables('storageAccountName'),'.blob.core.windows.net/',variables('vmStorageAccountContainerName'),'/',variables('server1Name'),'.vhd')]"
-                        },
+                        "createOption": "FromImage",
+                        "osType": "Windows",
+                        "name": "[variables('OSDiskName')]",
                        "caching": "ReadWrite",
-                        "createOption": "FromImage"
+                        "managedDisk": {
+                          "storageAccountType": "[variables('storageAccountType')]"
+                        },
+                        "diskSizeGB": 128
                    }
                },
                "networkProfile": {
--- a/navdeveloperpreviewext.json
+++ b/navdeveloperpreviewext.json
@ -324,7 +324,7 @@
        "imageOffer": "[if(equals(variables('OperatingSystem'),'Windows 10'),'Windows-10','WindowsServer')]",
        "imageSku": "[if(equals(variables('OperatingSystem'),'Windows 10'),'rs5-pro',if(equals(variables('OperatingSystem'),'Windows Server 2016'),'2016-Datacenter',if(equals(variables('OperatingSystem'),'Windows Server 2019'),'2019-Datacenter','2019-Datacenter-with-containers')))]",
        "storageAccountType": "[parameters('StorageAccountType')]",
-        "vmStorageAccountContainerName": "vhds",
+        "OSDiskName": "[concat(variables('vmName'),'_osdisk')]",
        "publicIPAddressName": "[concat(variables('vmName'), '_pip')]",
        "storageAccountName": "[concat('storage', uniqueString(resourceGroup().id))]",
        "networkSecurityGroupName": "networksecuritygroup",
@ -736,12 +736,14 @@
                        "version": "latest"
                    },
                    "osDisk": {
-                        "name": "osdisk",
-                        "vhd": {
-                            "uri": "[concat('http://',variables('storageAccountName'),'.blob.core.windows.net/',variables('vmStorageAccountContainerName'),'/',variables('server1Name'),'.vhd')]"
-                        },
+                        "createOption": "FromImage",
+                        "osType": "Windows",
+                        "name": "[variables('OSDiskName')]",
                        "caching": "ReadWrite",
-                        "createOption": "FromImage"
+                        "managedDisk": {
+                          "storageAccountType": "[variables('storageAccountType')]"
+                        },
+                        "diskSizeGB": 128
                    }
                },
                "networkProfile": {