Merge pull request #2646 from h1ppo/patch-2

updating choices for rds parameter engines

cloud/amazon/rds_param_group.py

@@ -47,7 +47,7 @@ options:
     required: false
     default: null
     aliases: []
-    choices: [ 'mysql5.1', 'mysql5.5', 'mysql5.6', 'oracle-ee-11.2', 'oracle-se-11.2', 'oracle-se1-11.2', 'postgres9.3', 'postgres9.4', 'sqlserver-ee-10.5', 'sqlserver-ee-11.0', 'sqlserver-ex-10.5', 'sqlserver-ex-11.0', 'sqlserver-se-10.5', 'sqlserver-se-11.0', 'sqlserver-web-10.5', 'sqlserver-web-11.0']
+    choices: [ 'aurora5.6', 'mariadb10.0', 'mysql5.1', 'mysql5.5', 'mysql5.6', 'oracle-ee-11.2', 'oracle-ee-12.1', 'oracle-se-11.2', 'oracle-se-12.1', 'oracle-se1-11.2', 'oracle-se1-12.1', 'postgres9.3', 'postgres9.4', 'sqlserver-ee-10.5', 'sqlserver-ee-11.0', 'sqlserver-ex-10.5', 'sqlserver-ex-11.0', 'sqlserver-ex-12.0', 'sqlserver-se-10.5', 'sqlserver-se-11.0', 'sqlserver-se-12.0', 'sqlserver-web-10.5', 'sqlserver-web-11.0', 'sqlserver-web-12.0' ]
   immediate:
     description:
       - Whether to apply the changes immediately, or after the next reboot of any associated instances.
@@ -60,7 +60,6 @@ options:
     required: false
     default: null
     aliases: []
-    choices: [ 'mysql5.1', 'mysql5.5', 'mysql5.6', 'oracle-ee-11.2', 'oracle-se-11.2', 'oracle-se1-11.2', 'postgres9.3', 'postgres9.4', 'sqlserver-ee-10.5', 'sqlserver-ee-11.0', 'sqlserver-ex-10.5', 'sqlserver-ex-11.0', 'sqlserver-se-10.5', 'sqlserver-se-11.0', 'sqlserver-web-10.5', 'sqlserver-web-11.0']
 author: "Scott Anderson (@tastychutney)"
 extends_documentation_fragment:
     - aws
@@ -84,22 +83,30 @@ EXAMPLES = '''
 '''
 
 VALID_ENGINES = [
+    'aurora5.6',
+    'mariadb10.0',
     'mysql5.1',
     'mysql5.5',
     'mysql5.6',
     'oracle-ee-11.2',
+    'oracle-ee-12.1',
     'oracle-se-11.2',
+    'oracle-se-12.1',
     'oracle-se1-11.2',
+    'oracle-se1-12.1',
     'postgres9.3',
     'postgres9.4',
     'sqlserver-ee-10.5',
     'sqlserver-ee-11.0',
     'sqlserver-ex-10.5',
     'sqlserver-ex-11.0',
+    'sqlserver-ex-12.0',
     'sqlserver-se-10.5',
     'sqlserver-se-11.0',
+    'sqlserver-se-12.0',
     'sqlserver-web-10.5',
     'sqlserver-web-11.0',
+    'sqlserver-web-12.0',
 ]
 
 try: