Setup gvamysql using new mechanisms

2020-03-04 19:32:22 +01:00 · 2020-03-04 19:32:22 +01:00 · bcb92e483d
commit bcb92e483d
parent 3b48b4a455
7 changed files with 75 additions and 38 deletions
--- a/states/patches/files/3000-mysql.diff
+++ b/states/patches/files/3000-mysql.diff
@ -0,0 +1,13 @@
+diff --git a/salt/modules/mysql.py b/salt/modules/mysql.py
+index 87e2361e28..37436206d4 100644
+--- a/salt/modules/mysql.py
+++ b/salt/modules/mysql.py
+@@ -355,7 +355,7 @@ def _connect(**kwargs):
+                 except IndexError:
+                     return
+             val = __salt__['config.option']('mysql.{0}'.format(name), None)
+-            if val is not None:
+            if val != '':
+                 connargs[key] = val
+
+     # If a default file is explicitly passed to kwargs, don't grab the