From e3e3b8be72bf78545111ac03466ca2fe898f21a1 Mon Sep 17 00:00:00 2001 From: Fred-sun Date: Tue, 1 Sep 2020 11:34:09 +0800 Subject: [PATCH 1/3] add new version for azure_rm_mariadbserver --- plugins/modules/azure_rm_mariadbserver.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/modules/azure_rm_mariadbserver.py b/plugins/modules/azure_rm_mariadbserver.py index f99327c04..f02c6fe41 100644 --- a/plugins/modules/azure_rm_mariadbserver.py +++ b/plugins/modules/azure_rm_mariadbserver.py @@ -63,6 +63,7 @@ - Server version. choices: - 10.2 + - 10.3 enforce_ssl: description: - Enable SSL enforcement. @@ -121,7 +122,7 @@ sample: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.DBforMariaDB/servers/mariadbsrv1b6dd89593 version: description: - - Server version. Possible values include C(10.2). + - Server version. Possible values include C(10.2) and C(10.3). returned: always type: str sample: 10.2 @@ -180,7 +181,7 @@ def __init__(self): ), version=dict( type='str', - choices=['10.2'] + choices=['10.2', '10,3'] ), enforce_ssl=dict( type='bool', From 59fc9e998a8b70d2d4b67c012168e10acd6213ff Mon Sep 17 00:00:00 2001 From: Fred-sun Date: Tue, 1 Sep 2020 11:39:40 +0800 Subject: [PATCH 2/3] add test sample --- .../integration/targets/azure_rm_mariadbserver/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/targets/azure_rm_mariadbserver/tasks/main.yml b/tests/integration/targets/azure_rm_mariadbserver/tasks/main.yml index eecb895cb..35df36698 100644 --- a/tests/integration/targets/azure_rm_mariadbserver/tasks/main.yml +++ b/tests/integration/targets/azure_rm_mariadbserver/tasks/main.yml @@ -104,7 +104,7 @@ tier: Basic location: westus2 storage_mb: 51200 - version: 10.2 + version: 10.3 enforce_ssl: True admin_username: zimxyz admin_password: Password123! @@ -120,7 +120,7 @@ tier: Basic location: westus2 storage_mb: 51200 - version: 10.2 + version: 10.3 enforce_ssl: True admin_username: zimxyz admin_password: Password123! From fd2dbd855b3ceb032a48879244ea469b4146b947 Mon Sep 17 00:00:00 2001 From: Fred-sun Date: Tue, 1 Sep 2020 14:01:38 +0800 Subject: [PATCH 3/3] add new change --- plugins/modules/azure_rm_mariadbserver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/modules/azure_rm_mariadbserver.py b/plugins/modules/azure_rm_mariadbserver.py index f02c6fe41..c5c666728 100644 --- a/plugins/modules/azure_rm_mariadbserver.py +++ b/plugins/modules/azure_rm_mariadbserver.py @@ -181,7 +181,7 @@ def __init__(self): ), version=dict( type='str', - choices=['10.2', '10,3'] + choices=['10.2', '10.3'] ), enforce_ssl=dict( type='bool',