Skip to content

Commit

Permalink
fix pdk validation problems
Browse files Browse the repository at this point in the history
  • Loading branch information
Lightning- committed Jan 18, 2024
1 parent 3b2fe67 commit c0c7158
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
1 change: 1 addition & 0 deletions .puppet-lint.rc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
--relative
--no-140chars-check
6 changes: 3 additions & 3 deletions .sync.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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')
2 changes: 1 addition & 1 deletion spec/acceptance/galera_codership_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand Down
10 changes: 5 additions & 5 deletions templates/clustercheck.epp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c0c7158

Please sign in to comment.