From d8ad80ae0fd4cd0de7cff6745e2778bfd8a3ae60 Mon Sep 17 00:00:00 2001 From: David Fischer Date: Fri, 27 May 2016 11:49:42 +0200 Subject: [PATCH] Add MariaDB to valid RDS engines (#3337) * Add MariaDB to valid RDS engines * Update RDS module documentation --- cloud/amazon/rds.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cloud/amazon/rds.py b/cloud/amazon/rds.py index b7b0d7a149f..1ba5d33efd5 100644 --- a/cloud/amazon/rds.py +++ b/cloud/amazon/rds.py @@ -40,9 +40,10 @@ options: db_engine: description: - The type of database. Used only when command=create. + - mariadb was added in version 2.2 required: false 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: description: - 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 DEFAULT_PORTS= { + 'mariadb': 3306, 'mysql': 3306, 'oracle': 1521, 'sqlserver': 1433, @@ -1023,7 +1025,7 @@ def main(): command = dict(choices=['create', 'replicate', 'delete', 'facts', 'modify', 'promote', 'snapshot', 'reboot', 'restore'], required=True), instance_name = 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), instance_type = dict(aliases=['type'], required=False), username = dict(required=False),