Merge pull request openshift#6735 from r4f4/azure-stack-upi-avset-fix

openshift-merge-robot · web-flow · commit 30c33c33071e · 2023-02-07T10:52:02.000-05:00
OCPBUGS-5234: azurestack: upi: fix compute scale up
diff --git a/upi/azurestack/02_storage.json b/upi/azurestack/02_storage.json
@@ -18,7 +18,7 @@
   },
   "variables" : {
     "location" : "[resourceGroup().location]",
-    "imageName" : "[concat(parameters('baseName'), '-image')]"
+    "imageName" : "[parameters('baseName')]"
   },
   "resources" : [
     {
diff --git a/upi/azurestack/03_infra.json b/upi/azurestack/03_infra.json
@@ -20,7 +20,7 @@
     "masterPublicIpAddressID" : "[resourceId('Microsoft.Network/publicIPAddresses', variables('masterPublicIpAddressName'))]",
     "masterLoadBalancerName" : "[concat(parameters('baseName'))]",
     "masterLoadBalancerID" : "[resourceId('Microsoft.Network/loadBalancers', variables('masterLoadBalancerName'))]",
-    "masterAvailabilitySetName" : "[concat(parameters('baseName'), '-avset')]",
+    "masterAvailabilitySetName" : "[concat(parameters('baseName'), '-cluster')]",
     "internalLoadBalancerName" : "[concat(parameters('baseName'), '-internal')]",
     "internalLoadBalancerID" : "[resourceId('Microsoft.Network/loadBalancers', variables('internalLoadBalancerName'))]",
     "skuName": "Basic"
diff --git a/upi/azurestack/04_bootstrap.json b/upi/azurestack/04_bootstrap.json
@@ -40,12 +40,12 @@
     "masterSubnetName" : "[concat(parameters('baseName'), '-master-subnet')]",
     "masterSubnetRef" : "[concat(variables('virtualNetworkID'), '/subnets/', variables('masterSubnetName'))]",
     "masterLoadBalancerName" : "[concat(parameters('baseName'))]",
-    "masterAvailabilitySetName" : "[concat(parameters('baseName'), '-avset')]",
+    "masterAvailabilitySetName" : "[concat(parameters('baseName'), '-cluster')]",
     "internalLoadBalancerName" : "[concat(parameters('baseName'), '-internal')]",
     "sshKeyPath" : "/home/core/.ssh/authorized_keys",
     "vmName" : "[concat(parameters('baseName'), '-bootstrap')]",
     "nicName" : "[concat(variables('vmName'), '-nic')]",
-    "imageName" : "[concat(parameters('baseName'), '-image')]",
+    "imageName" : "[parameters('baseName')]",
     "clusterNsgName" : "[concat(parameters('baseName'), '-nsg')]",
     "sshPublicIpAddressName" : "[concat(variables('vmName'), '-ssh-pip')]"
   },
diff --git a/upi/azurestack/05_masters.json b/upi/azurestack/05_masters.json
@@ -46,11 +46,11 @@
     "masterSubnetName" : "[concat(parameters('baseName'), '-master-subnet')]",
     "masterSubnetRef" : "[concat(variables('virtualNetworkID'), '/subnets/', variables('masterSubnetName'))]",
     "masterLoadBalancerName" : "[concat(parameters('baseName'))]",
-    "masterAvailabilitySetName" : "[concat(parameters('baseName'), '-avset')]",
+    "masterAvailabilitySetName" : "[concat(parameters('baseName'), '-cluster')]",
     "internalLoadBalancerName" : "[concat(parameters('baseName'), '-internal')]",
     "sshKeyPath" : "/home/core/.ssh/authorized_keys",
     "clusterNsgName" : "[concat(parameters('baseName'), '-nsg')]",
-    "imageName" : "[concat(parameters('baseName'), '-image')]",
+    "imageName" : "[parameters('baseName')]",
     "numberOfMasters" : 3,
     "vms" : {
       "copy" : [
diff --git a/upi/azurestack/06_workers.json b/upi/azurestack/06_workers.json
@@ -50,8 +50,8 @@
     "infraLoadBalancerName" : "[parameters('baseName')]",
     "sshKeyPath" : "/home/core/.ssh/authorized_keys",
     "identityName" : "[concat(parameters('baseName'), '-identity')]",
-    "imageName" : "[concat(parameters('baseName'), '-image')]",
-    "masterAvailabilitySetName" : "[concat(parameters('baseName'), '-avset')]",
+    "imageName" : "[parameters('baseName')]",
+    "masterAvailabilitySetName" : "[concat(parameters('baseName'), '-cluster')]",
     "numberOfNodes" : "[parameters('numberOfNodes')]",
     "vms" : {
       "copy" : [

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`},`
`19`	`19`	`"variables" : {`
`20`	`20`	`"location" : "[resourceGroup().location]",`
`21`		`- "imageName" : "[concat(parameters('baseName'), '-image')]"`
	`21`	`+ "imageName" : "[parameters('baseName')]"`
`22`	`22`	`},`
`23`	`23`	`"resources" : [`
`24`	`24`	`{`