8000 Add the way to create a VM with the image id by smile37773 · Pull Request #58106 · ansible/ansible · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

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

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
merged 7 commits into from
Jun 20, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7e7e38c
modify the vm
kpack37 Jun 20, 2019
f81b34f
modify the vm
kpack37 Jun 20, 2019
8562f83
fix the error of 'line too long'
kpack37 Jun 20, 2019
8328436
Modify syntax error
kpack37 Jun 20, 2019
e68b981
modify the id sample
kpack37 Jun 20, 2019
882a045
modify the test file
kpack37 Jun 20, 2019
d59a7f5
fix the image_id
kpack37 Jun 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
L 10000 oading
Diff view
Diff view
17 changes: 16 additions & 1 deletion lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,16 @@
name: customimage001
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
azure_rm_virtualmachine:
resource_group: myResourceGroup
Expand Down Expand Up @@ -988,8 +998,13 @@ def exec_module(self, **kwargs):
image_reference = self.get_custom_image_reference(
self.image.get('name'),
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:
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):
custom_image = True
image_reference = self.get_custom_image_reference(self.image)
Expand Down
2 changes: 1 addition & 1 deletion test/integration/targets/azure_rm_virtualmachine/tasks/azure_test_invalid.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
image:
offer: UbuntuServer
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
azure_rm_virtualmachine:
Expand Down
0