Skip to content

Commit 79a4a5b

Browse files
committed
Revert "- Update Tables: Userdata now supported "
This reverts commit 910ee1d.
1 parent 53b5e8e commit 79a4a5b

File tree

5 files changed

+7
-9
lines changed

5 files changed

+7
-9
lines changed

articles/virtual-machine-scale-sets/orchestration-modes-api-comparison.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ This article compares the API differences between Uniform and [Flexible orchestr
2727
| Uniform API | Flexible alternative |
2828
|-|-|
2929
| [Deallocate](/rest/api/compute/virtualmachinescalesetvms/deallocate) | [Invoke Single VM API - Deallocate](/rest/api/compute/virtualmachines/deallocate) |
30-
| [Delete](/rest/api/compute/virtualmachinescalesetvms/delete) | VMSS Batch delete API supported by VMSS in Flexible Orchestration Mode |
30+
| [Delete](/rest/api/compute/virtualmachinescalesetvms/delete) | [Invoke Single VM API -Delete](/rest/api/compute/virtualmachines/delete) |
3131
| [Get Instance View](/rest/api/compute/virtualmachinescalesetvms/getinstanceview) | [Invoke Single VM API - Instance View](/rest/api/compute/virtualmachines/instanceview) |
3232
| [Perform Maintenance](/rest/api/compute/virtualmachinescalesetvms/performmaintenance) | [Invoke Single VM API - Perform Maintenance](/rest/api/compute/virtualmachines/performmaintenance) |
3333
| [Power Off](/rest/api/compute/virtualmachinescalesetvms/poweroff) | [Invoke Single VM API - Power Off](/rest/api/compute/virtualmachines/poweroff) |

articles/virtual-machine-scale-sets/virtual-machine-scale-sets-orchestration-modes.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,14 @@ The following table compares the Flexible orchestration mode, Uniform orchestrat
104104
| Spot instances and pricing  | Yes, you can have both Spot and Regular priority instances | Yes, instances must either be all Spot or all Regular | No, Regular priority instances only |
105105
| Mix operating systems | Yes, Linux and Windows can reside in the same Flexible scale set | No, instances are the same operating system | Yes, Linux and Windows can reside in the same availability set |
106106
| Disk Types | Managed disks only, all storage types | Managed and unmanaged disks, all storage types | Managed and unmanaged disks, Ultradisk not supported |
107-
| Disk Server Side Encryption with Customer Managed Keys | Yes | Yes | Yes |
108107
| Write Accelerator  | No | Yes | Yes |
109108
| Proximity Placement Groups  | Yes, read [Proximity Placement Groups documentation](../virtual-machine-scale-sets/proximity-placement-groups.md) | Yes, read [Proximity Placement Groups documentation](../virtual-machine-scale-sets/proximity-placement-groups.md) | Yes |
110109
| Azure Dedicated Hosts  | No | Yes | Yes |
111110
| Managed Identity | User Assigned Identity Only | System Assigned or User Assigned | N/A (can specify Managed Identity on individual instances) |
112111
| Add/remove existing VM to the group | No | No | No |
113112
| Service Fabric | No | Yes | No |
114113
| Azure Kubernetes Service (AKS) / AKE | No | Yes | No |
115-
| UserData | Yes | Yes | UserData can be specified for individual VMs |
114+
| UserData | Partial, UserData can be specified for individual VMs | Yes | UserData can be specified for individual VMs |
116115

117116

118117
### Autoscaling and instance orchestration
@@ -130,7 +129,7 @@ The following table compares the Flexible orchestration mode, Uniform orchestrat
130129
| Instance Protection | No, use [Azure resource lock](../azure-resource-manager/management/lock-resources.md) | Yes | No |
131130
| Scale In Policy | No | Yes | No |
132131
| VMSS Get Instance View | No | Yes | N/A |
133-
| VM Batch Operations (Start all, Stop all, delete subset, etc.) | Partial, Batch delete is supported. Other operations can be triggered on each instance using VM API) | Yes | No |
132+
| VM Batch Operations (Start all, Stop all, delete subset, etc.) | No (can trigger operations on each instance using VM API) | Yes | No |
134133

135134
### High availability 
136135

articles/virtual-machines/flexible-virtual-machine-scale-sets.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,14 @@ The following tables list the Flexible orchestration mode features and links to
113113
| Spot instances and pricing  | Yes, you can have both Spot and Regular priority instances |
114114
| Mix operating systems | Yes, Linux and Windows can reside in the same Flexible scale set |
115115
| Disk Types | Managed disks only, all storage types |
116-
| Disk Server Side Encryption with Customer Managed Keys | Yes |
117116
| Write Accelerator  | No |
118117
| Proximity Placement Groups  | Yes, read [Proximity Placement Groups documentation](../virtual-machine-scale-sets/proximity-placement-groups.md) |
119118
| Azure Dedicated Hosts  | No |
120119
| Managed Identity | User Assigned Identity Only |
121120
| Add/remove existing VM to the group | No |
122121
| Service Fabric | No |
123122
| Azure Kubernetes Service (AKS) / AKE | No |
124-
| UserData | Yes |
123+
| UserData | Partial, UserData can be specified for individual VMs |
125124

126125

127126
### Autoscaling and instance orchestration
@@ -140,7 +139,7 @@ The following tables list the Flexible orchestration mode features and links to
140139
| Instance Protection | No, use [Azure resource lock](../azure-resource-manager/management/lock-resources.md) |
141140
| Scale In Policy | No |
142141
| VMSS Get Instance View | No |
143-
| VM Batch Operations (Start all, Stop all, delete subset, etc.) | Partial, Batch delete is supported. Other operations can be triggered on each instance using VM API) |
142+
| VM Batch Operations (Start all, Stop all, delete subset, etc.) | No (can trigger operations on each instance using VM API) |
144143

145144
### High availability 
146145

articles/virtual-machines/linux/disks-enable-customer-managed-keys-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.subservice: disks
1212

1313
# Use the Azure CLI to enable server-side encryption with customer-managed keys for managed disks
1414

15-
**Applies to:** :heavy_check_mark: Linux VMs :heavy_check_mark: Windows VMs :heavy_check_mark: Flexible scale sets :heavy_check_mark: Uniform scale sets
15+
**Applies to:** :heavy_check_mark: Linux VMs :heavy_check_mark: Flexible scale sets
1616

1717
Azure Disk Storage allows you to manage your own keys when using server-side encryption (SSE) for managed disks, if you choose. For conceptual information on SSE with customer managed keys, as well as other managed disk encryption types, see the [Customer-managed keys](../disk-encryption.md#customer-managed-keys) section of our disk encryption article.
1818

articles/virtual-machines/windows/disks-enable-customer-managed-keys-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.custom: devx-track-azurepowershell, ignite-fall-2021
1212

1313
# Azure PowerShell - Enable customer-managed keys with server-side encryption - managed disks
1414

15-
**Applies to:** :heavy_check_mark: Windows VMs :heavy_check_mark: Flexible scale sets
15+
**Applies to:** :heavy_check_mark: Windows VMs
1616

1717
Azure Disk Storage allows you to manage your own keys when using server-side encryption (SSE) for managed disks, if you choose. For conceptual information on SSE with customer-managed keys, and other managed disk encryption types, see the [Customer-managed keys](../disk-encryption.md#customer-managed-keys) section of our disk encryption article.
1818

0 commit comments

Comments
 (0)