mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-24 13:50:22 -07:00
several vmss fixes (#49580)
This commit is contained in:
parent
c0520b94b8
commit
a74449b05f
1 changed files with 17 additions and 16 deletions
|
@ -696,7 +696,7 @@ class AzureRMVirtualMachineScaleSet(AzureRMModuleBase):
|
||||||
|
|
||||||
for data_disk in self.data_disks:
|
for data_disk in self.data_disks:
|
||||||
data_disk_managed_disk = self.compute_models.VirtualMachineScaleSetManagedDiskParameters(
|
data_disk_managed_disk = self.compute_models.VirtualMachineScaleSetManagedDiskParameters(
|
||||||
storage_account_type=data_disk['managed_disk_type']
|
storage_account_type=data_disk.get('managed_disk_type', None)
|
||||||
)
|
)
|
||||||
|
|
||||||
data_disk['caching'] = data_disk.get(
|
data_disk['caching'] = data_disk.get(
|
||||||
|
@ -705,10 +705,10 @@ class AzureRMVirtualMachineScaleSet(AzureRMModuleBase):
|
||||||
)
|
)
|
||||||
|
|
||||||
data_disks.append(self.compute_models.VirtualMachineScaleSetDataDisk(
|
data_disks.append(self.compute_models.VirtualMachineScaleSetDataDisk(
|
||||||
lun=data_disk['lun'],
|
lun=data_disk.get('lun', None),
|
||||||
caching=data_disk['caching'],
|
caching=data_disk.get('caching', None),
|
||||||
create_option=self.compute_models.DiskCreateOptionTypes.empty,
|
create_option=self.compute_models.DiskCreateOptionTypes.empty,
|
||||||
disk_size_gb=data_disk['disk_size_gb'],
|
disk_size_gb=data_disk.get('disk_size_gb', None),
|
||||||
managed_disk=data_disk_managed_disk,
|
managed_disk=data_disk_managed_disk,
|
||||||
))
|
))
|
||||||
|
|
||||||
|
@ -725,18 +725,19 @@ class AzureRMVirtualMachineScaleSet(AzureRMModuleBase):
|
||||||
vmss_resource.virtual_machine_profile.storage_profile.os_disk.caching = self.os_disk_caching
|
vmss_resource.virtual_machine_profile.storage_profile.os_disk.caching = self.os_disk_caching
|
||||||
vmss_resource.sku.capacity = self.capacity
|
vmss_resource.sku.capacity = self.capacity
|
||||||
|
|
||||||
data_disks = []
|
if self.data_disks is not None:
|
||||||
for data_disk in self.data_disks:
|
data_disks = []
|
||||||
data_disks.append(self.compute_models.VirtualMachineScaleSetDataDisk(
|
for data_disk in self.data_disks:
|
||||||
lun=data_disk['lun'],
|
data_disks.append(self.compute_models.VirtualMachineScaleSetDataDisk(
|
||||||
caching=data_disk['caching'],
|
lun=data_disk['lun'],
|
||||||
create_option=self.compute_models.DiskCreateOptionTypes.empty,
|
caching=data_disk['caching'],
|
||||||
disk_size_gb=data_disk['disk_size_gb'],
|
create_option=self.compute_models.DiskCreateOptionTypes.empty,
|
||||||
managed_disk=self.compute_models.VirtualMachineScaleSetManagedDiskParameters(
|
disk_size_gb=data_disk['disk_size_gb'],
|
||||||
storage_account_type=data_disk['managed_disk_type']
|
managed_disk=self.compute_models.VirtualMachineScaleSetManagedDiskParameters(
|
||||||
),
|
storage_account_type=data_disk['managed_disk_type']
|
||||||
))
|
),
|
||||||
vmss_resource.virtual_machine_profile.storage_profile.data_disks = data_disks
|
))
|
||||||
|
vmss_resource.virtual_machine_profile.storage_profile.data_disks = data_disks
|
||||||
|
|
||||||
self.log("Update virtual machine with parameters:")
|
self.log("Update virtual machine with parameters:")
|
||||||
self.create_or_update_vmss(vmss_resource)
|
self.create_or_update_vmss(vmss_resource)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue