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

Merge pull request #2524 from Shrews/os_image

Browse source 
Bug fix for os_image and min_disk/min_ram
This commit is contained in:
Matt Martz 2015-11-23 16:45:11 -06:00
commit 03035d7a31
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cloud/openstack/os_image.py
View file

@ -56,12 +56,12 @@ options:
default: None default: None
min_disk: min_disk:
description: description:
- The minimum disk space required to deploy this image - The minimum disk space (in GB) required to boot this image
required: false required: false
default: None default: None
min_ram: min_ram:
description: description:
- The minimum ram required to deploy this image - The minimum ram (in MB) required to boot this image
required: false required: false
default: None default: None
is_public: is_public:
@ -125,8 +125,8 @@ def main():
disk_format = dict(default='qcow2', choices=['ami', 'ari', 'aki', 'vhd', 'vmdk', 'raw', 'qcow2', 'vdi', 'iso']), disk_format = dict(default='qcow2', choices=['ami', 'ari', 'aki', 'vhd', 'vmdk', 'raw', 'qcow2', 'vdi', 'iso']),
container_format = dict(default='bare', choices=['ami', 'aki', 'ari', 'bare', 'ovf', 'ova']), container_format = dict(default='bare', choices=['ami', 'aki', 'ari', 'bare', 'ovf', 'ova']),
owner = dict(default=None), owner = dict(default=None),
min_disk = dict(default=None), min_disk = dict(type='int', default=0),
min_ram = dict(default=None), min_ram = dict(type='int', default=0),
is_public = dict(default=False), is_public = dict(default=False),
filename = dict(default=None), filename = dict(default=None),
ramdisk = dict(default=None), ramdisk = dict(default=None),
@ -156,6 +156,8 @@ def main():
wait=module.params['wait'], wait=module.params['wait'],
timeout=module.params['timeout'], timeout=module.params['timeout'],
is_public=module.params['is_public'], is_public=module.params['is_public'],
min_disk=module.params['min_disk'],
min_ram=module.params['min_ram']
) )
changed = True changed = True
if not module.params['wait']: if not module.params['wait']: