From 9d598d95a6bde03e8d6249521a02ad7cde033df1 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Thu, 20 Feb 2020 17:02:51 -0800 Subject: [PATCH] puppet: Fix puppet-lint warning. Signed-off-by: Anders Kaseorg --- puppet/zulip/manifests/memcached.pp | 4 ++-- tools/lint | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/puppet/zulip/manifests/memcached.pp b/puppet/zulip/manifests/memcached.pp index c1c1d1d4c4..0db5033ca3 100644 --- a/puppet/zulip/manifests/memcached.pp +++ b/puppet/zulip/manifests/memcached.pp @@ -22,7 +22,7 @@ class zulip::memcached { notify => Exec[generate_memcached_sasldb2], } exec { 'generate_memcached_sasldb2': - require => [ + require => [ Package[$memcached_packages], Package[$zulip::sasl_modules::sasl_module_packages], File['/etc/sasl2/memcached-zulip-password'], @@ -30,7 +30,7 @@ class zulip::memcached { refreshonly => true, # Pass the hostname explicitly because otherwise saslpasswd2 # lowercases it and memcached does not. - command => "bash -c 'saslpasswd2 -p -f /etc/sasl2/memcached-sasldb2 \ + command => "bash -c 'saslpasswd2 -p -f /etc/sasl2/memcached-sasldb2 \ -a memcached -u \"\$HOSTNAME\" zulip < /etc/sasl2/memcached-zulip-password'", } file { '/etc/sasl2/memcached-sasldb2': diff --git a/tools/lint b/tools/lint index c880c123ac..68751cb17e 100755 --- a/tools/lint +++ b/tools/lint @@ -64,7 +64,8 @@ def run(): description="Runs the puppet parser validator, " "checking for syntax errors.") linter_config.external_linter('puppet-lint', - ['puppet-lint'] + PUPPET_CHECK_RULES_TO_EXCLUDE, ['pp'], + ['puppet-lint', '--fail-on-warnings'] + PUPPET_CHECK_RULES_TO_EXCLUDE, + ['pp'], fix_arg='--fix', description="Standard puppet linter" "(config: tools/linter_lib/exclude.py)")