Skip to content

Added DiskEnryptionSet property in the managed disk parameters for the VM/VMSS #7293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hyonholee merged 6 commits into from
Sep 24, 2019
Merged

Added DiskEnryptionSet property in the managed disk parameters for the VM/VMSS #7293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
75c8308
updated swagger
hari-bodicherla Sep 17, 2019
ad461c0
updated swagger
hari-bodicherla Sep 18, 2019
84d4399
Removed example files which are not relevant and added links to examp…
hari-bodicherla Sep 23, 2019
bfb3cc9
fixed the syntax error
hari-bodicherla Sep 23, 2019
6f5bedd
updated swagger
hari-bodicherla Sep 23, 2019
4419fc6
fixed the sytax error
hari-bodicherla Sep 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 52 additions & 40 deletions specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/compute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2003,6 +2003,15 @@
},
"Create a virtual machine image that includes a data disk from a managed disk.": {
"$ref": "./examples/CreateAnImageThatIncludesADataDiskFromAManagedDisk.json"
},
"Create a virtual machine image from a blob with DiskEncryptionSet resource.": {
"$ref": "./examples/CreateAnImageFromABlobWithDiskEncryptionSet.json"
},
"Create a virtual machine image from a snapshot with DiskEncryptionSet resource.": {
"$ref": "./examples/CreateAnImageFromASnapshotWithDiskEncryptionSet.json"
},
"Create a virtual machine image from a managed disk with DiskEncryptionSet resource.": {
"$ref": "./examples/CreateAnImageFromAManagedDiskWithDiskEncryptionSet.json"
}
},
"x-ms-long-running-operation": true
Expand Down Expand Up @@ -2365,6 +2374,9 @@
},
"Create a vm with ephemeral os disk.": {
"$ref": "./examples/CreateAVmWithADiffOsDisk.json"
},
"Create a vm with DiskEncryptionSet resource id in the os disk and data disk.": {
"$ref": "./examples/CreateAVmWithDiskEncryptionSetResource.json"
}
}
},
Expand Down Expand Up @@ -3141,6 +3153,9 @@
},
"Create a scale set with terminate scheduled events enabled.": {
"$ref": "./examples/CreateAScaleSetWithTerminateScheduledEventEnabled.json"
},
"Create a scale set with DiskEncryptionSet resource in os disk and data disk.": {
"$ref": "./examples/CreateAScalesetWithDiskEncryptionSetResource.json"
}
}
},
Expand Down Expand Up @@ -6478,6 +6493,10 @@
],
"description": "Describes a reference to Key Vault Secret"
},
"DiskEncryptionSet": {
"$ref": "#/definitions/SubResource",
"description": "Describes the parameter of customer managed disk encryption set resource id that can be specified for disk. <br><br> NOTE: The disk encryption set resource id can only be specified for managed disk. Please refer https://aka.ms/mdssewithcmkoverview for more details."
},
"KeyVaultKeyReference": {
"properties": {
"keyUrl": {
Expand Down Expand Up @@ -6586,6 +6605,10 @@
"storageAccountType": {
"$ref": "#/definitions/StorageAccountType",
"description": "Specifies the storage account type for the managed disk. NOTE: UltraSSD_LRS can only be used with data disks, it cannot be used with OS Disk."
},
"diskEncryptionSet": {
"$ref": "#/definitions/DiskEncryptionSet",
"description": "Specifies the customer managed disk encryption set resource id for the managed disk."
}
},
"allOf": [
Expand Down Expand Up @@ -7582,42 +7605,13 @@
"name": "OperatingSystemStateTypes",
"modelAsString": false
}
},
"snapshot": {
"$ref": "#/definitions/SubResource",
"description": "The snapshot."
},
"managedDisk": {
"$ref": "#/definitions/SubResource",
"description": "The managedDisk."
},
"blobUri": {
"type": "string",
"description": "The Virtual Hard Disk."
},
"caching": {
"type": "string",
"description": "Specifies the caching requirements. <br><br> Possible values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite** <br><br> Default: **None for Standard storage. ReadOnly for Premium storage**",
"enum": [
"None",
"ReadOnly",
"ReadWrite"
],
"x-ms-enum": {
"name": "CachingTypes",
"modelAsString": false
}
},
"diskSizeGB": {
"type": "integer",
"format": "int32",
"description": "Specifies the size of empty data disks in gigabytes. This element can be used to overwrite the name of the disk in a virtual machine image. <br><br> This value cannot be larger than 1023 GB"
},
"storageAccountType": {
"$ref": "#/definitions/StorageAccountType",
"description": "Specifies the storage account type for the managed disk. UltraSSD_LRS cannot be used with OS Disk."
}
},
"allOf": [
{
"$ref": "#/definitions/ImageDisk"
}
],
"required": [
"osType",
"osState"
Expand All @@ -7630,8 +7624,21 @@
"type": "integer",
"format": "int32",
"description": "Specifies the logical unit number of the data disk. This value is used to identify data disks within the VM and therefore must be unique for each data disk attached to a VM."
},
"snapshot": {
}
},
"allOf": [
{
"$ref": "#/definitions/ImageDisk"
}
],
"required": [
"lun"
],
"description": "Describes a data disk."
},
"ImageDisk": {
"properties": {
"snapshot": {
"$ref": "#/definitions/SubResource",
"description": "The snapshot."
},
Expand Down Expand Up @@ -7664,12 +7671,13 @@
"storageAccountType": {
"$ref": "#/definitions/StorageAccountType",
"description": "Specifies the storage account type for the managed disk. NOTE: UltraSSD_LRS can only be used with data disks, it cannot be used with OS Disk."
},
"diskEncryptionSet": {
"$ref": "#/definitions/DiskEncryptionSet",
"description": "Specifies the customer managed disk encryption set resource id for the managed image disk."
}
},
"required": [
"lun"
],
"description": "Describes a data disk."
"description": "Describes a image disk."
},
"ImageStorageProfile": {
"properties": {
Expand Down Expand Up @@ -7873,6 +7881,10 @@
"storageAccountType": {
"$ref": "#/definitions/StorageAccountType",
"description": "Specifies the storage account type for the managed disk. NOTE: UltraSSD_LRS can only be used with data disks, it cannot be used with OS Disk."
},
"diskEncryptionSet": {
"$ref": "#/definitions/DiskEncryptionSet",
"description": "Specifies the customer managed disk encryption set resource id for the managed disk."
}
},
"description": "Describes the parameters of a ScaleSet managed disk."
Expand Down
Loading