Fix domain name label

CSA-OCP-GER · Feb 16, 2021 · 107ae09 · 107ae09
1 parent ebe9fab
commit 107ae09
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/azuredeploy.json b/azuredeploy.json
@@ -87,6 +87,9 @@
                 },
                 "serviceName": {
                     "value": "[parameters('serviceName')]"
+                },
+                  "serviceIPRangePrefix": {
+                    "value": "[parameters('serviceIPRangePrefix')]"
                 },
                 "localAdminPWD": {
                   "value": "[parameters('localAdminPWD')]"

diff --git a/infra-backend/infra-backend.json b/infra-backend/infra-backend.json
@@ -8,6 +8,9 @@
         "serviceName": {
             "type": "string"
         },
+        "serviceIPRangePrefix": {
+            "type": "string"
+        },
         "localAdminPWD":  {
             "type": "securestring"
         }
@@ -17,7 +20,7 @@
     },
     "resources": [
             {
-               "name": "[concat(parameters('serviceName'), '-', variables('vmName'),'-PublicIP')]",
+               "name": "[concat(variables('vmName'),'-PublicIP')]",
                "type": "Microsoft.Network/publicIPAddresses",
                "apiVersion": "2019-11-01",
                "location": "[resourceGroup().location]",
@@ -27,7 +30,7 @@
                "properties": {
                    "publicIPAllocationMethod": "Dynamic",
                    "dnsSettings": {
-                       "domainNameLabel": "[toLower(variables('vmName'))]"
+                       "domainNameLabel": "[toLower(concat(parameters('serviceName'), '-', variables('vmName')))]"
                    }
                }
            },
@@ -38,7 +41,7 @@
                "apiVersion": "2019-11-01",
                "location": "[resourceGroup().location]",
                "dependsOn": [
-                   "[resourceId('Microsoft.Network/publicIPAddresses', concat(parameters('serviceName'), '-', variables('vmName'),'-PublicIP'))]"
+                   "[resourceId('Microsoft.Network/publicIPAddresses', concat(variables('vmName'),'-PublicIP'))]"
                   ],
                "tags": {
                    "displayName": "[concat(variables('vmName'),' Network Interface Try')]"
@@ -50,7 +53,7 @@
                            "properties": {
                                "privateIPAllocationMethod": "Dynamic",
                                "publicIPAddress": {
-                                   "id": "[resourceId('Microsoft.Network/publicIPAddresses',concat(parameters('serviceName'), '-', variables('vmName'),'-PublicIP'))]"
+                                   "id": "[resourceId('Microsoft.Network/publicIPAddresses',concat(variables('vmName'),'-PublicIP'))]"
                                },
                                "subnet": {
                                    "id": "[resourceId(concat('rg-',parameters('serviceName'),'-shared-prod'),'Microsoft.Network/virtualNetworks/subnets',concat('vnet-',parameters('serviceName'),'-',parameters('serviceLocation'),'prod-001') ,concat('snet-',parameters('serviceName'),'-backend-prod-001'))]"