#24 remove strange default values for the AdVnet name and the AdSubne…

…t name
Azure · Mar 6, 2017 · 7deeceb · 7deeceb
1 parent 2a1b1e4
commit 7deeceb
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 14 deletions.
diff --git a/rds-deployment-existing-ad/azuredeploy.json b/rds-deployment-existing-ad/azuredeploy.json
@@ -15,19 +15,19 @@
       },
       "defaultValue": "contoso.com"
     },
-    "adVnetName": {
+    "existingVnet": {
       "type": "string",
+      "defaultValue": "vnet",
       "metadata": {
-        "description": "The vnet name of AD domain. For example johnvnet1"
-      },
-      "defaultValue": "[concat('ADVNET',resourceGroup().name)]"
+        "description": "The VNET name of AD domain. For example johnvnet1"
+      }
     },
-    "adSubnetName": {
+    "existingSubnet": {
       "type": "string",
+      "defaultValue": "Subnet",
       "metadata": {
         "description": "The subnet name of AD domain. For example johnsubnet1"
-      },
-      "defaultValue": "[concat('ADStaticSubnet',resourceGroup().name)]"
+      }
     },
     "adminUsername": {
       "type": "string",
@@ -78,7 +78,7 @@
     "imagePublisher": "MicrosoftWindowsServer",
     "imageOffer": "WindowsServer",
     "dnsServerPrivateIp": "10.0.0.4",
-    "subnet-id": "[concat(resourceId('Microsoft.Network/virtualNetworks',parameters('adVnetName')),'/subnets/',parameters('adSubnetName'))]",
+    "subnet-id": "[concat(resourceId('Microsoft.Network/virtualNetworks',parameters('existingVnet')),'/subnets/',parameters('existingSubnet'))]",
     "publicIpRef": "publicIp",
     "brokerIpRef": "brokerpublicIp",
     "gatewayIpRef": "gatewaypublicIp",

diff --git a/rds-deployment-existing-ad/azuredeploy.parameters.json b/rds-deployment-existing-ad/azuredeploy.parameters.json
@@ -6,7 +6,13 @@
       "value": "GEN-UNIQUE"
     },
     "adminPassword": {
-      "value": "GEN-PASSWORD"
+        "value": "GEN-PASSWORD"
+    },
+    "existingVnet": {
+      "value": "vnet"
+    },
+    "existingSubnet": {
+      "value": "Subnet"
     }
   }
 }
diff --git a/rds-deployment/azuredeploy.json b/rds-deployment/azuredeploy.json
@@ -25,16 +25,15 @@
     "adminUsername": {
       "type": "string",
       "metadata": {
-        "description": "The name of the administrator of the new VM and the domain. Exclusion list: 'administrator'. For example johnadmin"
+        "description": "The name of the administrator of the new VM and the domain. Exclusion list: 'administrator'. For example: 'cloudadmin'"
       },
-      "defaultValue": "vmadmin"
+      "defaultValue": "cloudadmin"
     },
     "adminPassword": {
       "type": "securestring",
       "metadata": {
         "description": "The password for the administrator account of the new VM and the domain"
-      },
-      "defaultValue": "[concat('Subscription#',subscription().subscriptionId)]"
+      }
     },
     "imageSKU": {
       "type": "string",
@@ -51,7 +50,7 @@
       "type": "int",
       "defaultValue": 1,
       "metadata": {
-        "description": "Number of RemoteDesktopSessionHosts"
+        "description": "Number of Remote Desktop Session Host VMs"
       }
     },
     "rdshVmSize": {

diff --git a/rds-deployment/azuredeploy.parameters.json b/rds-deployment/azuredeploy.parameters.json
@@ -5,6 +5,9 @@
     "gwdnsLabelPrefix": {
       "value": "GEN-UNIQUE"
     },
+    "adminUsername": {
+      "value": "GEN-UNIQUE"
+    },
     "adminPassword": {
       "value": "GEN-PASSWORD"
     }