From 853471f14d039d54109ea445727ae380cf655ed4 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Thu, 19 Jun 2014 00:04:04 -0500 Subject: [PATCH] Handle integer param values that are calculated values Fixes #7828 --- library/cloud/rds_param_group | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/library/cloud/rds_param_group b/library/cloud/rds_param_group index 83f11e4c619..39f9432057a 100644 --- a/library/cloud/rds_param_group +++ b/library/cloud/rds_param_group @@ -159,10 +159,15 @@ def set_parameter(param, value, immediate): elif param.type == 'integer': if isinstance(value, basestring): - for modifier in INT_MODIFIERS.keys(): - if value.endswith(modifier): - converted_value = int(value[:-1]) * INT_MODIFIERS[modifier] - converted_value = int(converted_value) + try: + for modifier in INT_MODIFIERS.keys(): + if value.endswith(modifier): + converted_value = int(value[:-1]) * INT_MODIFIERS[modifier] + converted_value = int(converted_value) + except ValueError: + # may be based on a variable (ie. {foo*3/4}) so + # just pass it on through to boto + converted_value = str(value) elif type(value) == bool: converted_value = 1 if value else 0 else: @@ -190,7 +195,16 @@ def modify_group(group, params, immediate=False): param = group[key] new_value = new_params[key] - if param.value != new_value: + try: + old_value = param.value + except ValueError: + # some versions of boto have problems with retrieving + # integer values from params that may have their value + # based on a variable (ie. {foo*3/4}), so grab it in a + # way that bypasses the property functions + old_value = param._value + + if old_value != new_value: if not param.is_modifiable: raise NotModifiableError('Parameter %s is not modifiable.' % key)