cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

azure_rm_virtualmachine: fixing issue #63844 (#65601)

Browse source
This commit is contained in:
haiyuan_zhang 2019-12-19 15:48:38 +08:00 committed by Zim Kalinowski
parent ee58225970
commit a168e73713
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py
View file

@ -162,7 +162,6 @@ options:
choices: choices:
- ReadOnly - ReadOnly
- ReadWrite - ReadWrite
default: ReadOnly
aliases: aliases:
- disk_caching - disk_caching
os_disk_size_gb: os_disk_size_gb:
@ -819,8 +818,7 @@ class AzureRMVirtualMachine(AzureRMModuleBase):
storage_account_name=dict(type='str', aliases=['storage_account']), storage_account_name=dict(type='str', aliases=['storage_account']),
storage_container_name=dict(type='str', aliases=['storage_container'], default='vhds'), storage_container_name=dict(type='str', aliases=['storage_container'], default='vhds'),
storage_blob_name=dict(type='str', aliases=['storage_blob']), storage_blob_name=dict(type='str', aliases=['storage_blob']),
os_disk_caching=dict(type='str', aliases=['disk_caching'], choices=['ReadOnly', 'ReadWrite'], os_disk_caching=dict(type='str', aliases=['disk_caching'], choices=['ReadOnly', 'ReadWrite']),
default='ReadOnly'),
os_disk_size_gb=dict(type='int'), os_disk_size_gb=dict(type='int'),
managed_disk_type=dict(type='str', choices=['Standard_LRS', 'StandardSSD_LRS', 'Premium_LRS']), managed_disk_type=dict(type='str', choices=['Standard_LRS', 'StandardSSD_LRS', 'Premium_LRS']),
os_disk_name=dict(type='str'), os_disk_name=dict(type='str'),
@ -1240,6 +1238,9 @@ class AzureRMVirtualMachine(AzureRMModuleBase):
requested_storage_uri, requested_storage_uri,
self.storage_container_name, self.storage_container_name,
self.storage_blob_name) self.storage_blob_name)
# disk caching
if not self.os_disk_caching:
self.os_disk_caching = 'ReadOnly'
if not self.short_hostname: if not self.short_hostname:
self.short_hostname = self.name self.short_hostname = self.name