From ad6ff73e28025829b6c5d9a6b83a4f784f4347e1 Mon Sep 17 00:00:00 2001
From: kenazk <kenazk@microsoft.com>
Date: Tue, 28 Apr 2015 11:02:20 -0700
Subject: [PATCH] Revert "Modified parameters file"

This reverts commit 5ed1302264a5ec4494767d1335b2045589445c0d.
---
 ...eploy.parameters.json => azuredeploy-parameters.json} | 0
 ...eploy.parameters.json => azuredeploy-parameters.json} | 3 +++
 101-create-storage-account-premium/azuredeploy.json      | 9 ++++++++-
 ...eploy.parameters.json => azuredeploy-parameters.json} | 0
 4 files changed, 11 insertions(+), 1 deletion(-)
 rename 101-create-security-group/{azuredeploy.parameters.json => azuredeploy-parameters.json} (100%)
 rename 101-create-storage-account-premium/{azuredeploy.parameters.json => azuredeploy-parameters.json} (55%)
 rename 101-create-storage-account-standard/{azuredeploy.parameters.json => azuredeploy-parameters.json} (100%)

diff --git a/101-create-security-group/azuredeploy.parameters.json b/101-create-security-group/azuredeploy-parameters.json
similarity index 100%
rename from 101-create-security-group/azuredeploy.parameters.json
rename to 101-create-security-group/azuredeploy-parameters.json
diff --git a/101-create-storage-account-premium/azuredeploy.parameters.json b/101-create-storage-account-premium/azuredeploy-parameters.json
similarity index 55%
rename from 101-create-storage-account-premium/azuredeploy.parameters.json
rename to 101-create-storage-account-premium/azuredeploy-parameters.json
index e6abbb3..3c7092f 100644
--- a/101-create-storage-account-premium/azuredeploy.parameters.json
+++ b/101-create-storage-account-premium/azuredeploy-parameters.json
@@ -2,4 +2,7 @@
     "newStorageAccountName" : {
         "value" : ""
     },
+    "location": {
+        "value": "West US"
+    }
 }
diff --git a/101-create-storage-account-premium/azuredeploy.json b/101-create-storage-account-premium/azuredeploy.json
index 92aafd3..a1fcfaa 100644
--- a/101-create-storage-account-premium/azuredeploy.json
+++ b/101-create-storage-account-premium/azuredeploy.json
@@ -7,6 +7,13 @@
       "metadata": {
           "description": "Name of the Storage Account"
       }
+    },
+    "location": {
+      "type": "string",
+      "allowedValues": ["West US", "West Europe", "South East Asia"],
+      "metadata": {
+          "description": "Location of Premium storage account"
+      }
     }
   },
   "resources": [
@@ -14,7 +21,7 @@
       "type": "Microsoft.Storage/storageAccounts",
       "name": "[parameters('newStorageAccountName')]",
       "apiVersion": "2015-05-01-preview",
-      "location": "resourceGroup().Location",
+      "location": "[parameters('location')]",
       "properties": {
         "accountType": "Premium_LRS"
       }
diff --git a/101-create-storage-account-standard/azuredeploy.parameters.json b/101-create-storage-account-standard/azuredeploy-parameters.json
similarity index 100%
rename from 101-create-storage-account-standard/azuredeploy.parameters.json
rename to 101-create-storage-account-standard/azuredeploy-parameters.json