Skip to content

Commit

Permalink
[rds_instance] don't hardcode license_model choices (ansible#53409)
Browse files Browse the repository at this point in the history
* Don't hardcode license_model choices
  • Loading branch information
s-hertel authored and Akasurde committed May 8, 2019
1 parent c5f3b77 commit 463a7ff
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
bugfixes:
- rds_instance - Don't hardcode the license models because there are accepted values undocumented by AWS.
Rely on the exception handling instead to provide a helpful error for invalid license models.
8 changes: 3 additions & 5 deletions lib/ansible/modules/cloud/amazon/rds_instance.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,8 @@
license_model:
description:
- The license model for the DB instance.
choices:
- license-included
- bring-your-own-license
- general-public-license
- Several options are license-included, bring-your-own-license, and general-public-license.
- This option can also be omitted to default to an accepted value.
type: str
master_user_password:
description:
Expand Down Expand Up @@ -1090,7 +1088,7 @@ def main():
force_failover=dict(type='bool'),
iops=dict(type='int'),
kms_key_id=dict(),
license_model=dict(choices=['license-included', 'bring-your-own-license', 'general-public-license']),
license_model=dict(),
master_user_password=dict(aliases=['password'], no_log=True),
master_username=dict(aliases=['username']),
monitoring_interval=dict(type='int'),
Expand Down

0 comments on commit 463a7ff

Please sign in to comment.