Merge pull request #142 from malscent/main

fix location/resource group stupidity
couchbase-partners · Apr 15, 2022 · 8789d87 · 8789d87
2 parents fcb366c + e7392f5
commit 8789d87
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/azure/CouchbaseServer-Application/mainTemplate.json b/azure/CouchbaseServer-Application/mainTemplate.json
@@ -239,7 +239,7 @@
       "apiVersion": "2021-12-01",
       "type": "Microsoft.Network/networkSecurityGroups",
       "name": "[couchbase.generateResourceName('networkSecurityGroups', parameters('_now'))]",
-      "location": "[parameters('resourceGroup')]",
+      "location": "[parameters('location')]",
       "properties": {
         "securityRules": [
           {
@@ -434,7 +434,7 @@
       "type": "Microsoft.KeyVault/vaults",
       "apiVersion": "2019-09-01",
       "name": "[couchbase.generateResourceName('vault', parameters('_now'))]",
-      "location": "[parameters('resourceGroup')]",
+      "location": "[parameters('location')]",
       "dependsOn": [
         "[resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', couchbase.generateResourceName('identity', parameters('_now')))]",
         "[resourceId('Microsoft.Authorization/roleAssignments', variables('assignmentReaderGuid'))]"

diff --git a/azure/CouchbaseServerAndSyncGateway-Application/mainTemplate.json b/azure/CouchbaseServerAndSyncGateway-Application/mainTemplate.json
@@ -41,7 +41,7 @@
       "defaultValue": {
         "value": {
           "name": "Couchbase-Vnet",
-          "resourceGroup": "[resourceGroup().location]",
+          "resourceGroup": "[parameters('resourceGroup')]",
           "addressPrefixes": [
             "10.32.0.0/16"
           ],
@@ -312,7 +312,7 @@
       "apiVersion": "2021-12-01",
       "location": "[parameters('location')]",
       "tags": {
-        "usedBy": "[parameters('resourceGroup')]"
+        "usedBy": "[parameters('location')]"
       },
       "dependsOn": [
         "[resourceId('Microsoft.Network/networkSecurityGroups/', couchbase.generateResourceName('networkSecurityGroups'))]"