Merge pull request #1254 from samdoiron/devel

Fix Issue #1216 (ValueError with Amazon RDS)
This commit is contained in:
Brian Coca 2015-05-05 10:11:51 -04:00
commit f99bc6a17f

View file

@ -78,7 +78,7 @@ EXAMPLES = '''
name: norwegian_blue name: norwegian_blue
description: 'My Fancy Ex Parrot Group' description: 'My Fancy Ex Parrot Group'
engine: 'mysql5.6' engine: 'mysql5.6'
params: params:
auto_increment_increment: "42K" auto_increment_increment: "42K"
# Remove a parameter group # Remove a parameter group
@ -196,8 +196,8 @@ def modify_group(group, params, immediate=False):
if not param.is_modifiable: if not param.is_modifiable:
raise NotModifiableError('Parameter %s is not modifiable.' % key) raise NotModifiableError('Parameter %s is not modifiable.' % key)
changed[key] = {'old': param.value, 'new': new_value} changed[key] = {'old': old_value, 'new': new_value}
set_parameter(param, new_value, immediate) set_parameter(param, new_value, immediate)
del new_params[key] del new_params[key]
@ -260,7 +260,7 @@ def main():
if e.error_code != 'DBParameterGroupNotFound': if e.error_code != 'DBParameterGroupNotFound':
module.fail_json(msg = e.error_message) module.fail_json(msg = e.error_message)
exists = False exists = False
if state == 'absent': if state == 'absent':
if exists: if exists:
conn.delete_parameter_group(group_name) conn.delete_parameter_group(group_name)
@ -284,7 +284,7 @@ def main():
marker = next_group.Marker marker = next_group.Marker
else: else:
break break
except BotoServerError, e: except BotoServerError, e:
module.fail_json(msg = e.error_message) module.fail_json(msg = e.error_message)