Location fix

Changed resource location from parameter to resourceGroup().location. Deleted location parameter from deployment template and parameter file.
Azure · Jun 18, 2016 · 387bd5a · 387bd5a
1 parent 5b58fe4
commit 387bd5a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 27 deletions.
diff --git a/101-key-vault-create/azuredeploy.json b/101-key-vault-create/azuredeploy.json
@@ -8,29 +8,6 @@
         "description": "Name of the Vault"
       }
     },
-    "location": {
-      "type": "string",
-      "allowedValues": [
-        "Central US",
-        "East US",
-        "East US 2",
-        "North Central US",
-        "South Central US",
-        "West US",
-        "North Europe",
-        "West Europe",
-        "East Asia",
-        "Southeast Asia",
-        "Japan East",
-        "Japan West",
-        "Brazil South",
-        "Australia East",
-        "Australia Southeast"
-      ],
-      "metadata": {
-        "description": "Key Vault location"
-      }
-    },
     "tenantId": {
       "type": "string",
       "metadata": {
@@ -107,7 +84,7 @@
       "type": "Microsoft.KeyVault/vaults",
       "name": "[parameters('keyVaultName')]",
       "apiVersion": "2015-06-01",
-      "location": "[parameters('location')]",
+      "location": "[resourceGroup().location]",
       "properties": {
         "enabledForDeployment": "[parameters('enableVaultForDeployment')]",
         "enabledForDiskEncryption": "[parameters('enableVaultForDiskEncryption')]",

diff --git a/101-key-vault-create/azuredeploy.parameters.json b/101-key-vault-create/azuredeploy.parameters.json
@@ -5,9 +5,6 @@
     "keyVaultName": {
       "value": "testvault"
     },
-    "location": {
-      "value": "West US"
-    },
     "tenantId": {
       "value": "example-guid"
     },