Merge pull request #439 from yorinasub17/master

Use correct kwarg for master_user_password when creating rds2 database
This commit is contained in:
Steve Pulec 2015-10-20 12:59:58 -04:00
commit 849f6f57d4
2 changed files with 3 additions and 3 deletions

View File

@ -135,7 +135,7 @@ class Database(object):
"engine": properties.get("Engine"), "engine": properties.get("Engine"),
"engine_version": properties.get("EngineVersion"), "engine_version": properties.get("EngineVersion"),
"iops": properties.get("Iops"), "iops": properties.get("Iops"),
"master_password": properties.get('MasterUserPassword'), "master_user_password": properties.get('MasterUserPassword'),
"master_username": properties.get('MasterUsername'), "master_username": properties.get('MasterUsername'),
"multi_az": properties.get("MultiAZ"), "multi_az": properties.get("MultiAZ"),
"port": properties.get('Port', 3306), "port": properties.get('Port', 3306),

View File

@ -27,7 +27,7 @@ class RDS2Response(BaseResponse):
"engine": self._get_param("Engine"), "engine": self._get_param("Engine"),
"engine_version": self._get_param("EngineVersion"), "engine_version": self._get_param("EngineVersion"),
"iops": self._get_int_param("Iops"), "iops": self._get_int_param("Iops"),
"master_password": self._get_param('MasterUserPassword'), "master_user_password": self._get_param('MasterUserPassword'),
"master_username": self._get_param('MasterUsername'), "master_username": self._get_param('MasterUsername'),
"multi_az": self._get_bool_param("MultiAZ"), "multi_az": self._get_bool_param("MultiAZ"),
# OptionGroupName # OptionGroupName
@ -504,4 +504,4 @@ ADD_TAGS_TO_RESOURCE_TEMPLATE = \
REMOVE_TAGS_FROM_RESOURCE_TEMPLATE = \ REMOVE_TAGS_FROM_RESOURCE_TEMPLATE = \
"""{"RemoveTagsFromResourceResponse": {"ResponseMetadata": {"RequestId": "c6499a01-a664-11e4-8069-fb454b71a80e"}}} """{"RemoveTagsFromResourceResponse": {"ResponseMetadata": {"RequestId": "c6499a01-a664-11e4-8069-fb454b71a80e"}}}
""" """