cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add MariaDB to valid RDS engines (#3337)

Browse source 
* Add MariaDB to valid RDS engines

* Update RDS module documentation
This commit is contained in:
David Fischer 2016-05-27 11:49:42 +02:00 committed by Matt Clay
parent 1977b42956
commit adec050165
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/cloud/amazon/rds.py
View file

@ -40,9 +40,10 @@ options:
db_engine: db_engine:
description: description:
- The type of database. Used only when command=create. - The type of database. Used only when command=create.
- mariadb was added in version 2.2
required: false required: false
default: null default: null
choices: [ 'MySQL', 'oracle-se1', 'oracle-se', 'oracle-ee', 'sqlserver-ee', 'sqlserver-se', 'sqlserver-ex', 'sqlserver-web', 'postgres', 'aurora'] choices: [ 'mariadb', 'MySQL', 'oracle-se1', 'oracle-se', 'oracle-ee', 'sqlserver-ee', 'sqlserver-se', 'sqlserver-ex', 'sqlserver-web', 'postgres', 'aurora']
size: size:
description: description:
- Size in gigabytes of the initial storage for the DB instance. Used only when command=create or command=modify. - Size in gigabytes of the initial storage for the DB instance. Used only when command=create or command=modify.
@ -319,6 +320,7 @@ except ImportError:
has_rds2 = False has_rds2 = False
DEFAULT_PORTS= { DEFAULT_PORTS= {
'mariadb': 3306,
'mysql': 3306, 'mysql': 3306,
'oracle': 1521, 'oracle': 1521,
'sqlserver': 1433, 'sqlserver': 1433,
@ -1023,7 +1025,7 @@ def main():
command = dict(choices=['create', 'replicate', 'delete', 'facts', 'modify', 'promote', 'snapshot', 'reboot', 'restore'], required=True), command = dict(choices=['create', 'replicate', 'delete', 'facts', 'modify', 'promote', 'snapshot', 'reboot', 'restore'], required=True),
instance_name = dict(required=False), instance_name = dict(required=False),
source_instance = dict(required=False), source_instance = dict(required=False),
db_engine = dict(choices=['MySQL', 'oracle-se1', 'oracle-se', 'oracle-ee', 'sqlserver-ee', 'sqlserver-se', 'sqlserver-ex', 'sqlserver-web', 'postgres', 'aurora'], required=False), db_engine = dict(choices=['mariadb', 'MySQL', 'oracle-se1', 'oracle-se', 'oracle-ee', 'sqlserver-ee', 'sqlserver-se', 'sqlserver-ex', 'sqlserver-web', 'postgres', 'aurora'], required=False),
size = dict(required=False), size = dict(required=False),
instance_type = dict(aliases=['type'], required=False), instance_type = dict(aliases=['type'], required=False),
username = dict(required=False), username = dict(required=False),