From c0c7158fa8a2e6b79a520addd631874c68266fc0 Mon Sep 17 00:00:00 2001
From: Lightning <lightning@lightning-online.de>
Date: Thu, 18 Jan 2024 15:16:25 +0100
Subject: [PATCH] fix pdk validation problems

---
 .puppet-lint.rc                          |  1 +
 .sync.yml                                |  6 +++---
 Rakefile                                 |  1 +
 spec/acceptance/galera_codership_spec.rb |  2 +-
 templates/clustercheck.epp               | 10 +++++-----
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index cc96ece..a79ce0f 100644
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -1 +1,2 @@
 --relative
+--no-140chars-check
diff --git a/.sync.yml b/.sync.yml
index 6f8eadf..b7aa1ef 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,7 +1,7 @@
 ---
-.puppet-lint.rc:
-  required:
-    - '--no-140chars-check'
+Rakefile:
+  linter_options:
+    - no-140chars-check
 
 spec/spec_helper.rb:
   hiera_config: spec/fixtures/hiera.yaml
diff --git a/Rakefile b/Rakefile
index 77590fe..2d9df93 100644
--- a/Rakefile
+++ b/Rakefile
@@ -7,3 +7,4 @@ require 'puppet-syntax/tasks/puppet-syntax'
 require 'puppet-strings/tasks' if Gem.loaded_specs.key? 'puppet-strings'
 
 PuppetLint.configuration.send('disable_relative')
+PuppetLint.configuration.send('no-140chars-check')
diff --git a/spec/acceptance/galera_codership_spec.rb b/spec/acceptance/galera_codership_spec.rb
index 11ccc2d..4a082cb 100644
--- a/spec/acceptance/galera_codership_spec.rb
+++ b/spec/acceptance/galera_codership_spec.rb
@@ -21,7 +21,7 @@ class { 'galera':
           deb_sysmaint_password => 'sysmaint',
           configure_firewall    => false,
           galera_servers        => ['127.0.0.1'],
-          galera_master         => $::fqdn,
+          galera_master         => $fqdn,
           root_password         => 'root_password',
           status_password       => 'status_password',
           override_options      => {
diff --git a/templates/clustercheck.epp b/templates/clustercheck.epp
index a4c778e..b9bcc9f 100644
--- a/templates/clustercheck.epp
+++ b/templates/clustercheck.epp
@@ -33,12 +33,12 @@ if [ -e "/var/tmp/clustercheck.disabled" ]; then
     exit 1
 fi
 
-MYSQL_USERNAME="<%= $::galera::status_user %>"
-MYSQL_PASSWORD="<%= $::galera::status_password %>"
-MYSQL_HOST="<%= $::galera::status_host %>"
-AVAILABLE_WHEN_DONOR="<%= $::galera::status_available_when_donor %>"
+MYSQL_USERNAME="<%= $galera::status_user %>"
+MYSQL_PASSWORD="<%= $galera::status_password %>"
+MYSQL_HOST="<%= $galera::status_host %>"
+AVAILABLE_WHEN_DONOR="<%= $galera::status_available_when_donor %>"
 ERR_FILE="${4:-/dev/null}"
-AVAILABLE_WHEN_READONLY="${AVAILABLE_WHEN_READONLY:-<%= $::galera::status_available_when_readonly %>}"
+AVAILABLE_WHEN_READONLY="${AVAILABLE_WHEN_READONLY:-<%= $galera::status_available_when_readonly %>}"
 DEFAULTS_EXTRA_FILE=${6:-/etc/my.cnf}
 
 #Timeout exists for instances where mysqld may be hung