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

Add the way to create a VM with the image id (#58106)

Browse source
This commit is contained in:
smile37773 2019-06-20 16:42:09 +08:00 committed by Zim Kalinowski
parent cc7bea2100
commit 3a3465c47d
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -510,6 +510,16 @@ EXAMPLES = '''
name: customimage001 name: customimage001
resource_group: myResourceGroup resource_group: myResourceGroup
- name: Create a VM with an image id
azure_rm_virtualmachine:
resource_group: myResourceGroup
name: testvm001
vm_size: Standard_DS1_v2
admin_username: adminUser
admin_password: password01
image:
id: '{{image_id}}'
- name: Create VM with spcified OS disk size - name: Create VM with spcified OS disk size
azure_rm_virtualmachine: azure_rm_virtualmachine:
resource_group: myResourceGroup resource_group: myResourceGroup
@ -988,8 +998,13 @@ class AzureRMVirtualMachine(AzureRMModuleBase):
image_reference = self.get_custom_image_reference( image_reference = self.get_custom_image_reference(
self.image.get('name'), self.image.get('name'),
self.image.get('resource_group')) self.image.get('resource_group'))
elif self.image.get('id'):
try:
image_reference = self.compute_models.ImageReference(id=self.image['id'])
except Exception as exc:
self.fail("id Error: Cannot get image from the reference id - {0}".format(self.image['id']))
else: else:
self.fail("parameter error: expecting image to contain [publisher, offer, sku, version] or [name, resource_group]") self.fail("parameter error: expecting image to contain [publisher, offer, sku, version], [name, resource_group] or [id]")
elif self.image and isinstance(self.image, str): elif self.image and isinstance(self.image, str):
custom_image = True custom_image = True
image_reference = self.get_custom_image_reference(self.image) image_reference = self.get_custom_image_reference(self.image)

2
test/integration/targets/azure_rm_virtualmachine/tasks/azure_test_invalid.yml
View file

@ -6,7 +6,7 @@
image: image:
offer: UbuntuServer offer: UbuntuServer
register: fail_invalid_image_dict register: fail_invalid_image_dict
failed_when: 'fail_invalid_image_dict.msg != "parameter error: expecting image to contain [publisher, offer, sku, version] or [name, resource_group]"' failed_when: 'fail_invalid_image_dict.msg != "parameter error: expecting image to contain [publisher, offer, sku, version], [name, resource_group] or [id]"'
- name: Assert error thrown with invalid image type - name: Assert error thrown with invalid image type
azure_rm_virtualmachine: azure_rm_virtualmachine: