diff --git a/plugins/modules/azure_rm_virtualmachine.py b/plugins/modules/azure_rm_virtualmachine.py index 6a0d10f71..2b65404bc 100644 --- a/plugins/modules/azure_rm_virtualmachine.py +++ b/plugins/modules/azure_rm_virtualmachine.py @@ -184,6 +184,7 @@ - StandardSSD_ZRS - Premium_LRS - Premium_ZRS + - UltraSSD_LRS os_disk_name: description: - OS disk name. @@ -236,6 +237,7 @@ - StandardSSD_ZRS - Premium_LRS - Premium_ZRS + - UltraSSD_LRS storage_account_name: description: - Name of an existing storage account that supports creation of VHD blobs. @@ -974,7 +976,7 @@ def __init__(self): storage_blob_name=dict(type='str', aliases=['storage_blob']), os_disk_caching=dict(type='str', aliases=['disk_caching'], choices=['ReadOnly', 'ReadWrite']), os_disk_size_gb=dict(type='int'), - managed_disk_type=dict(type='str', choices=['Standard_LRS', 'StandardSSD_LRS', 'StandardSSD_ZRS', 'Premium_LRS', 'Premium_ZRS']), + managed_disk_type=dict(type='str', choices=['Standard_LRS', 'StandardSSD_LRS', 'StandardSSD_ZRS', 'Premium_LRS', 'Premium_ZRS', 'UltraSSD_LRS']), os_disk_name=dict(type='str'), proximity_placement_group=dict(type='dict', options=proximity_placement_group_spec), os_type=dict(type='str', choices=['Linux', 'Windows'], default='Linux'), diff --git a/plugins/modules/azure_rm_virtualmachinescaleset.py b/plugins/modules/azure_rm_virtualmachinescaleset.py index f532897de..1105aea53 100644 --- a/plugins/modules/azure_rm_virtualmachinescaleset.py +++ b/plugins/modules/azure_rm_virtualmachinescaleset.py @@ -148,6 +148,10 @@ choices: - Standard_LRS - Premium_LRS + - StandardSSD_LRS + - UltraSSD_LRS + - Premium_ZRS + - StandardSSD_ZRS data_disks: description: - Describes list of data disks. @@ -165,6 +169,10 @@ choices: - Standard_LRS - Premium_LRS + - StandardSSD_LRS + - UltraSSD_LRS + - Premium_ZRS + - StandardSSD_ZRS caching: description: - Type of data disk caching. @@ -641,7 +649,7 @@ def __init__(self): os_disk_caching=dict(type='str', aliases=['disk_caching'], choices=['ReadOnly', 'ReadWrite'], default='ReadOnly'), os_type=dict(type='str', choices=['Linux', 'Windows'], default='Linux'), - managed_disk_type=dict(type='str', choices=['Standard_LRS', 'Premium_LRS']), + managed_disk_type=dict(type='str', choices=['Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS', 'UltraSSD_LRS', 'Premium_ZRS', 'StandardSSD_ZRS']), data_disks=dict(type='list'), subnet_name=dict(type='str', aliases=['subnet']), public_ip_per_vm=dict(type='bool', default=False),