Skip to content

Commit 515c4f9

Browse files
authored
Merge pull request #110759 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents e4e3686 + 57b9cb5 commit 515c4f9

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

articles/openshift/howto-using-azure-redhat-openshift.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ keywords: aro, openshift, az aro, red hat, cli
1313
# Create, access, and manage an Azure Red Hat OpenShift 4.3 Cluster
1414

1515
> [!IMPORTANT]
16-
> Please note that Azure Red Hat OpenShift 4.3 is currently only available in private preview in East US. Private preview acceptance is by invitation only. Please be sure to register your subscription before attempting to enable this feature: [Azure Red Hat OpenShift Private Preview Registration](https://aka.ms/aro-preview-register)
16+
> Please note that Azure Red Hat OpenShift 4.3 is currently only available in private preview in East US and East US 2. Private preview acceptance is by invitation only. Please be sure to register your subscription before attempting to enable this feature: [Azure Red Hat OpenShift Private Preview Registration](https://aka.ms/aro-preview-register)
1717
1818
> [!NOTE]
1919
> Preview features are self-service and are provided as is and as available and are excluded from the service-level agreement (SLA) and limited warranty. Therefore, the features aren't meant for production use.
@@ -61,7 +61,7 @@ The `az aro` extension allows you to create, access, and delete Azure Red Hat Op
6161
az -v
6262
...
6363
Extensions:
64-
aro 0.1.0
64+
aro 0.3.0
6565
...
6666
```
6767

@@ -104,7 +104,7 @@ Follow these steps to create a virtual network containing two empty subnets.
104104
4. Add two empty subnets to your virtual network.
105105

106106
```console
107-
for subnet in "$CLUSTER-master" "$CLUSTER-worker"; do
107+
for subnet in "$CLUSTER-master" "$CLUSTER-worker"; do
108108
az network vnet subnet create \
109109
-g "$RESOURCEGROUP" \
110110
--vnet-name vnet \
@@ -137,6 +137,8 @@ az aro create \
137137
--vnet vnet \
138138
--master-subnet "$CLUSTER-master" \
139139
--worker-subnet "$CLUSTER-worker" \
140+
--cluster-resource-group "aro-$CLUSTER" \
141+
--domain "$CLUSTER" \
140142
--pull-secret "$PULL_SECRET"
141143
```
142144

articles/service-fabric/service-fabric-scale-up-node-type.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Here is the process for updating the VM size and operating system of the primary
2929
To find the new scale set in the template, search for the "Microsoft.Compute/virtualMachineScaleSets" resource named by the *vmNodeType2Name* parameter. The new scale set is added to the primary node type using the properties->virtualMachineProfile->extensionProfile->extensions->properties->settings->nodeTypeRef setting.
3030
4. Check the cluster health and verify all the nodes are healthy.
3131
5. Disable the nodes in the old scale set of the primary node type with the intent to remove node. You can disable all at once and the operations are queued. Wait until all nodes are disabled, which may take some time. As the older nodes in the node type are disabled, the system services and seed nodes migrate to the VMs of the new scale set in the primary node type.
32-
6. Remove the older scale set from the primary node type.
32+
6. Remove the older scale set from the primary node type. (After the nodes are disabled as in step 5, in the virtual machine scale set blade in the Azure portal, deallocate the nodes from the old node type one by one.)
3333
7. Remove the load balancer associated with the old scale set. The cluster is unavailable while the new public IP address and load balancer are configured for the new scale set.
3434
8. Store DNS settings of the public IP address associated with the old primary node type scale set in a variable and remove that public IP address.
3535
9. Replace the DNS settings of the public IP address associated with the new primary node type scale set with the DNS settings of the deleted public IP address. The cluster is now reachable again.

includes/functions-supported-languages.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ms.custom: include file
1818
|[F#](../articles/azure-functions/functions-reference-fsharp.md)|GA (.NET Framework 4.7)|GA (.NET Core 2.2)| GA (.NET Core 3.1) |
1919
|[Java](../articles/azure-functions/functions-reference-java.md)|N/A|GA (Java 8)| GA (Java 8)|
2020
|[PowerShell](../articles/azure-functions/functions-reference-powershell.md) |N/A|GA (PowerShell Core 6)| GA (PowerShell Core 6)|
21-
|[Python](../articles/azure-functions/functions-reference-python.md)#python-version|N/A|GA (Python 3.6 & 3.7)| GA (Python 3.6, 3.7, & 3.8)|
21+
|[Python](../articles/azure-functions/functions-reference-python.md#python-version)|N/A|GA (Python 3.6 & 3.7)| GA (Python 3.6, 3.7, & 3.8)|
2222
|[TypeScript](../articles/azure-functions/functions-reference-node.md#typescript) |N/A|GA<sup>1</sup>| GA<sup>1</sup> |
2323

2424

0 commit comments

Comments
 (0)