Merge pull request #152 from noris-network/fix_galera_validate

re-enable the content-check of validate
markt-de · May 7, 2020 · 50c0d7a · 50c0d7a
2 parents bca6616 + f638096
commit 50c0d7a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/manifests/validate.pp b/manifests/validate.pp
@@ -37,14 +37,14 @@
   }
 
   if $catch {
-    $truecatch = $catch
+    $truecatch = " -v ${catch}"
   } elsif $inv_catch {
-    $truecatch = " -v ${inv_catch}"
+    $truecatch = $inv_catch
   } else {
     fail('No catch method specified in galera validation script')
   }
 
-  $cmd = "mysql --host=${validate_host} --user=${validate_user} --password=${validate_password} -e '${action}'"
+  $cmd = "mysql --host=${validate_host} --user=${validate_user} --password=${validate_password} -e '${action}' | grep -q ${truecatch}"
   exec { 'validate_connection':
     path        => '/usr/bin:/bin:/usr/local/bin:/usr/sbin:/sbin:/usr/local/sbin',
     provider    => shell,