valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add default for 'visibility', should fix #25814

Browse Source
This commit is contained in:
Florian Ermisch 2015-07-29 18:57:02 +02:00
parent 2991e4028e
commit f050db5976
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/modules/glance.py
View File

@ -229,7 +229,8 @@ def image_create(name, location=None, profile=None, visibility=None,
copy_from=http://berrange.fedorapeople.org/\ copy_from=http://berrange.fedorapeople.org/\
images/2012-02-29/f16-x86_64-openstack-sda.qcow2 images/2012-02-29/f16-x86_64-openstack-sda.qcow2
For all possible values, run ``glance help image-create`` on the minion. The parameter 'visibility' defaults to 'public' if neither
'visibility' nor 'is_public' is specified.
''' '''
kwargs = {} kwargs = {}
# valid options for "visibility": # valid options for "visibility":
@ -258,7 +259,7 @@ def image_create(name, location=None, profile=None, visibility=None,
kwargs['copy_from'] = location kwargs['copy_from'] = location
if is_public is not None: if is_public is not None:
kwargs['is_public'] = is_public kwargs['is_public'] = is_public
else: elif visibility is not None:
if visibility not in v_list: if visibility not in v_list:
raise SaltInvocationError('"visibility" needs to be one ' + raise SaltInvocationError('"visibility" needs to be one ' +
'of the following: {0}'.format(', '.join(v_list))) 'of the following: {0}'.format(', '.join(v_list)))
@ -266,6 +267,8 @@ def image_create(name, location=None, profile=None, visibility=None,
kwargs['is_public'] = True kwargs['is_public'] = True
else: else:
kwargs['is_public'] = False kwargs['is_public'] = False
else:
kwargs['is_public'] = True
if container_format not in cf_list: if container_format not in cf_list:
raise SaltInvocationError('"container_format" needs to be ' + raise SaltInvocationError('"container_format" needs to be ' +
'one of the following: {0}'.format(', '.join(cf_list))) 'one of the following: {0}'.format(', '.join(cf_list)))