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

azure_rm_image: fix creation of image with data disks (#49394)

Browse source
This commit is contained in:
James E. King III 2018-12-04 20:36:34 -05:00 committed by Yunge Zhu
parent 15c5dbcc20
commit 79c0e30c5a
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/modules/cloud/azure/azure_rm_image.py
View file

@ -251,7 +251,7 @@ class AzureRMImage(AzureRMModuleBase):
if blob_uri or disk or snapshot: if blob_uri or disk or snapshot:
snapshot_resource = self.compute_models.SubResource(id=snapshot) if snapshot else None snapshot_resource = self.compute_models.SubResource(id=snapshot) if snapshot else None
managed_disk = self.compute_models.SubResource(id=disk) if disk else None managed_disk = self.compute_models.SubResource(id=disk) if disk else None
return self.compute_models.ImageDataDisk(lun, return self.compute_models.ImageDataDisk(lun=lun,
blob_uri=blob_uri, blob_uri=blob_uri,
snapshot=snapshot_resource, snapshot=snapshot_resource,
managed_disk=managed_disk) managed_disk=managed_disk)

17
test/integration/targets/azure_rm_image/tasks/main.yml
View file

@ -6,6 +6,7 @@
public_ip_name: "pip{{ resource_group | hash('md5') | truncate(7, True, '') }}{{ 1000 | random }}" public_ip_name: "pip{{ resource_group | hash('md5') | truncate(7, True, '') }}{{ 1000 | random }}"
security_group_name: "sg{{ resource_group | hash('md5') | truncate(7, True, '') }}{{ 1000 | random }}" security_group_name: "sg{{ resource_group | hash('md5') | truncate(7, True, '') }}{{ 1000 | random }}"
blob_name: "blob{{ resource_group | hash('md5') | truncate(7, True, '') }}{{ 1000 | random }}" blob_name: "blob{{ resource_group | hash('md5') | truncate(7, True, '') }}{{ 1000 | random }}"
empty_disk_name: "emptydisk{{ resource_group | hash('md5') | truncate(7, True, '') }}{{ 1000 | random }}"
- name: Create storage account - name: Create storage account
azure_rm_storageaccount: azure_rm_storageaccount:
@ -78,12 +79,22 @@
name: "{{ vm_name }}" name: "{{ vm_name }}"
vm_size: Standard_A0 vm_size: Standard_A0
- name: Create new empty managed disk
azure_rm_managed_disk:
resource_group: "{{ resource_group }}"
name: "{{ empty_disk_name }}"
storage_account_type: "Standard_LRS"
disk_size_gb: 1
register: emptydisk
- name: Create an image from VM (check mode) - name: Create an image from VM (check mode)
azure_rm_image: azure_rm_image:
resource_group: "{{ resource_group }}" resource_group: "{{ resource_group }}"
source: "https://{{ storage_name }}.blob.core.windows.net/{{ storage_container_name }}/{{ blob_name }}.vhd" source: "https://{{ storage_name }}.blob.core.windows.net/{{ storage_container_name }}/{{ blob_name }}.vhd"
name: testimage001 name: testimage001
os_type: Linux os_type: Linux
data_disk_sources:
- "{{ empty_disk_name }}"
check_mode: yes check_mode: yes
register: output register: output
@ -160,6 +171,12 @@
that: that:
- not output.changed - not output.changed
- name: Delete empty disk
azure_rm_managed_disk:
resource_group: "{{ resource_group }}"
name: "{{ empty_disk_name }}"
state: absent
- name: Delete VM - name: Delete VM
azure_rm_virtualmachine: azure_rm_virtualmachine:
resource_group: "{{ resource_group }}" resource_group: "{{ resource_group }}"