Merge pull request #2856 from AvyanConsultingCorp/master

Maintenance Updates for dependent services
Azure · Dec 10, 2016 · 2992b6e · 2992b6e
2 parents 9662808 + 9009773
commit 2992b6e
Showing 1 changed file with 2 additions and 15 deletions.
diff --git a/azure-governance-operations-automation/azuredeploy.json b/azure-governance-operations-automation/azuredeploy.json
@@ -109,7 +109,7 @@
     "WebAppDeployPackageFileName": "package.zip",
     "hostingPlanName": "[concat('CloudWiseHostingplan-', uniqueString(resourceGroup().id))]",
     "webSiteName": "[concat('CloudWise', uniqueString(resourceGroup().id))]",
-    "sqlserverName": "[concat('sql','cloudwise', uniqueString(resourceGroup().id, deployment().name))]",
+    "sqlserverName": "[concat('sqlcloudwise', uniqueString(resourceGroup().id))]",
     "sqlDatabaseName": "cloudwisedb",
     "sqlCollation": "SQL_Latin1_General_CP1_CI_AS",
     "sqlMaxSizeBytes": "1073741824",
@@ -152,19 +152,6 @@
             "maxSizeBytes": "[variables('sqlMaxSizeBytes')]",
             "requestedServiceObjectiveName": "[variables('sqlRequestedServiceObjectiveName')]"
           }
-        },
-        {
-          "apiVersion": "2014-04-01-preview",
-          "dependsOn": [
-            "[concat('Microsoft.Sql/servers/', variables('sqlServerName'))]"
-          ],
-          "location": "[resourceGroup().location]",
-          "name": "AllowAllWindowsAzureIps",
-          "properties": {
-            "endIpAddress": "0.0.0.0",
-            "startIpAddress": "0.0.0.0"
-          },
-          "type": "firewallrules"
         }
       ]
     },
@@ -458,7 +445,7 @@
     {
       "name": "[variables('insightsName')]",
       "type": "Microsoft.Insights/components",
-      "location": "Central US",
+      "location": "East US",
       "apiVersion": "2014-04-01",
       "dependsOn": [
         "[concat('Microsoft.Web/sites/', variables('webSiteName'))]"