Fix puppet-lint before upgrading gem

Removing puppet-lint warnings
in favor of upgrading to latest gem

2016-09-13 21:09:55.884631 | manifests/dispersion.pp:111:WARNING: line has more than 140 characters
2016-09-13 21:09:55.884753 | manifests/dispersion.pp:112:WARNING: line has more than 140 characters
2016-09-13 21:09:55.884790 | manifests/keystone/auth.pp:191:WARNING: line has more than 140 characters

Change-Id: Ie9b008bc51cc66f79503df89df793ba2f0f280b5
This commit is contained in:
Carlos Camacho
2016-09-14 13:33:18 +02:00
parent 10e94f9a07
commit 4d2dd27e5d
2 changed files with 4 additions and 1 deletions

View File

@@ -108,8 +108,10 @@ class swift::dispersion (
path => ['/bin', '/usr/bin'], path => ['/bin', '/usr/bin'],
subscribe => File['/etc/swift/dispersion.conf'], subscribe => File['/etc/swift/dispersion.conf'],
timeout => 0, timeout => 0,
# lint:ignore:140chars
onlyif => "swift -A ${auth_url} --os-username ${auth_user} --os-project-name ${auth_tenant} --os-password ${auth_pass} -V ${auth_version} stat | grep 'Account: '", onlyif => "swift -A ${auth_url} --os-username ${auth_user} --os-project-name ${auth_tenant} --os-password ${auth_pass} -V ${auth_version} stat | grep 'Account: '",
unless => "swift -A ${auth_url} --os-username ${auth_user} --os-project-name ${auth_tenant} --os-password ${auth_pass} -V ${auth_version} list | grep dispersion_", unless => "swift -A ${auth_url} --os-username ${auth_user} --os-project-name ${auth_tenant} --os-password ${auth_pass} -V ${auth_version} list | grep dispersion_",
# lint:endignore
require => Package['swiftclient'], require => Package['swiftclient'],
} }

View File

@@ -188,7 +188,8 @@ class swift::keystone::auth(
} }
if $port { if $port {
warning('The port parameter is deprecated, use public_url, internal_url, admin_url, public_url_s3, internal_url_s3 and admin_url_s3 instead.') warning('The port parameter is deprecated, use public_url, internal_url, admin_url, \
public_url_s3, internal_url_s3 and admin_url_s3 instead.')
} }
if $public_port { if $public_port {