Skip to content

Commit e60c491

Browse files
Merge pull request #63544 from dfitzmau/OCPBUGS-16610
OCPBUGS#16610: Updated UPI info in Azure account limits module
2 parents 22a5e8b + e5c4e13 commit e60c491

5 files changed

+23
-20
lines changed

modules/installation-about-custom-azure-vnet.adoc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ Your VNet must meet the following characteristics:
4545

4646
You must provide two subnets within your VNet, one for the control plane machines and one for the compute machines. Because Azure distributes machines in different availability zones within the region that you specify, your cluster will have high availability by default.
4747

48+
[NOTE]
49+
====
50+
By default, if you specify availability zones in the `install-config.yaml` file, the installation program distributes the control plane machines and the compute machines across link:https://azure.microsoft.com/en-us/global-infrastructure/availability-zones/[these availability zones]
51+
within link:https://azure.microsoft.com/en-us/global-infrastructure/regions[a region]. To ensure high availability for your cluster, select a region with at least three availability zones. If your region contains fewer than three availability zones, the installation program places more than one control plane machine in the available zones.
52+
====
53+
4854
To ensure that the subnets that you provide are suitable, the installation program confirms the following data:
4955

5056
* All the specified subnets exist.

modules/installation-azure-limits.adoc

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -109,17 +109,6 @@ To deploy more worker nodes, enable autoscaling, deploy large workloads, or use
109109
a different instance type, you must further increase the vCPU limit for your
110110
account to ensure that your cluster can deploy the machines that you require.
111111

112-
ifndef::ash[]
113-
By default, the installation program distributes control plane and compute machines across
114-
link:https://azure.microsoft.com/en-us/global-infrastructure/availability-zones/[all availability zones]
115-
within
116-
link:https://azure.microsoft.com/en-us/global-infrastructure/regions[a region].
117-
To ensure high availability for your cluster, select a region with at least
118-
three availability zones. If your region contains fewer than three availability
119-
zones, the installation program places more than one control plane machine in the
120-
available zones.
121-
endif::ash[]
122-
123112
ifndef::ash[]
124113
|OS Disk
125114
|7

modules/installation-configuration-parameters.adoc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1068,7 +1068,13 @@ ifdef::azure[]
10681068
[id="installation-configuration-parameters-additional-azure_{context}"]
10691069
== Additional Azure configuration parameters
10701070

1071-
Additional Azure configuration parameters are described in the following table:
1071+
Additional Azure configuration parameters are described in the following table.
1072+
1073+
[NOTE]
1074+
====
1075+
By default, if you specify availability zones in the `install-config.yaml` file, the installation program distributes the control plane machines and the compute machines across link:https://azure.microsoft.com/en-us/global-infrastructure/availability-zones/[these availability zones]
1076+
within link:https://azure.microsoft.com/en-us/global-infrastructure/regions[a region]. To ensure high availability for your cluster, select a region with at least three availability zones. If your region contains fewer than three availability zones, the installation program places more than one control plane machine in the available zones.
1077+
====
10721078

10731079
.Additional Azure parameters
10741080
[cols=".^2,.^3a,.^3a",options="header"]

modules/installation-creating-azure-control-plane.adoc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@ You must create the control plane machines in Microsoft {cp} for your cluster
2020
to use. One way to create these machines is to modify the provided Azure
2121
Resource Manager (ARM) template.
2222

23+
ifdef::azure[]
2324
[NOTE]
2425
====
25-
If you do not use the provided ARM template to create your control plane
26-
machines, you must review the provided information and manually create the
27-
infrastructure. If your cluster does not initialize correctly, you might have to
28-
contact Red Hat support with your installation logs.
26+
By default, Microsoft {cp} places control plane machines and compute machines in a pre-set availability zone. You can manually set an availability zone for a compute node or control plane node. To do this, modify a vendor's Azure Resource Manager (ARM) template by specifying each of your availability zones in the `zones` parameter of the virtual machine resource.
2927
====
28+
endif::azure[]
29+
30+
If you do not use the provided ARM template to create your control plane machines, you must review the provided information and manually create the infrastructure. If your cluster does not initialize correctly, consider contacting Red Hat support with your installation logs.
3031

3132
.Prerequisites
3233

modules/installation-creating-azure-worker.adoc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,14 @@ In this example, you manually launch one instance by using the Azure Resource
3333
Manager (ARM) template. Additional instances can be launched by including
3434
additional resources of type `06_workers.json` in the file.
3535

36+
ifdef::azure[]
3637
[NOTE]
3738
====
38-
If you do not use the provided ARM template to create your worker machines, you
39-
must review the provided information and manually create the infrastructure. If
40-
your cluster does not initialize correctly, you might have to contact Red Hat
41-
support with your installation logs.
39+
By default, Microsoft {cp} places control plane machines and compute machines in a pre-set availability zone. You can manually set an availability zone for a compute node or control plane node. To do this, modify a vendor's ARM template by specifying each of your availability zones in the `zones` parameter of the virtual machine resource.
4240
====
41+
endif::azure[]
42+
43+
If you do not use the provided ARM template to create your control plane machines, you must review the provided information and manually create the infrastructure. If your cluster does not initialize correctly, consider contacting Red Hat support with your installation logs.
4344

4445
.Prerequisites
4546

0 commit comments

Comments
 (0)