Don't set a default disk_config. Defaulting to 'auto', causes issues with new images

reviewable/pr18780/r1
Matt Martz 11 years ago
parent c8a5e0a95e
commit cfe1335665

@ -645,7 +645,7 @@ def main():
auto_increment=dict(choices=BOOLEANS, default=True, type='bool'), auto_increment=dict(choices=BOOLEANS, default=True, type='bool'),
count=dict(default=1, type='int'), count=dict(default=1, type='int'),
count_offset=dict(default=1, type='int'), count_offset=dict(default=1, type='int'),
disk_config=dict(default='auto', choices=['auto', 'manual']), disk_config=dict(choices=['auto', 'manual']),
exact_count=dict(choices=BOOLEANS, default=False, type='bool'), exact_count=dict(choices=BOOLEANS, default=False, type='bool'),
files=dict(type='dict', default={}), files=dict(type='dict', default={}),
flavor=dict(), flavor=dict(),
@ -678,7 +678,9 @@ def main():
auto_increment = module.params.get('auto_increment') auto_increment = module.params.get('auto_increment')
count = module.params.get('count') count = module.params.get('count')
count_offset = module.params.get('count_offset') count_offset = module.params.get('count_offset')
disk_config = module.params.get('disk_config').upper() disk_config = module.params.get('disk_config')
if disk_config:
disk_config = disk_config.upper()
exact_count = module.params.get('exact_count', False) exact_count = module.params.get('exact_count', False)
files = module.params.get('files') files = module.params.get('files')
flavor = module.params.get('flavor') flavor = module.params.get('flavor')

Loading…
Cancel
Save