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

cloud: ovirt: Add possibility to skip disk copy (#20656)

Browse source
This commit is contained in:
Ondra Machacek 2017-01-25 19:51:37 +01:00 committed by Ryan Brown
parent 07f762c26b
commit c7739be960
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/modules/cloud/ovirt/ovirt_disks.py
View file

@ -119,7 +119,9 @@ options:
- "C(**IMPORTANT**)" - "C(**IMPORTANT**)"
- "There is no reliable way to achieve idempotency, so every time - "There is no reliable way to achieve idempotency, so every time
you specify this parameter the disks are copied, so please handle you specify this parameter the disks are copied, so please handle
your playbook accordingly to not copy the disks all the time." your playbook accordingly to not copy the disks all the time. This
is valid only for VM and floating disks, template disks works
as expected."
version_added: "2.3" version_added: "2.3"
force: force:
description: description:
@ -254,7 +256,7 @@ def upload_disk_image(connection, module):
context.check_hostname = False context.check_hostname = False
context.verify_mode = ssl.CERT_NONE context.verify_mode = ssl.CERT_NONE
elif auth.get('ca_file'): elif auth.get('ca_file'):
context.load_verify_locations(cafile='ca.pem') context.load_verify_locations(cafile=auth.get('ca_file'))
proxy_connection = HTTPSConnection( proxy_connection = HTTPSConnection(
proxy_url.hostname, proxy_url.hostname,
@ -375,6 +377,9 @@ class DisksModule(BaseModule):
changed = changed or self.action( changed = changed or self.action(
action='copy', action='copy',
entity=disk, entity=disk,
action_condition=(
lambda disk: new_disk_storage.id not in [sd.id for sd in disk.storage_domains]
),
wait_condition=lambda disk: disk.status == otypes.DiskStatus.OK, wait_condition=lambda disk: disk.status == otypes.DiskStatus.OK,
storage_domain=otypes.StorageDomain( storage_domain=otypes.StorageDomain(
id=new_disk_storage.id, id=new_disk_storage.id,