diff --git a/manifests/dispersion.pp b/manifests/dispersion.pp index 3e1a899e..9b542ab5 100644 --- a/manifests/dispersion.pp +++ b/manifests/dispersion.pp @@ -108,8 +108,10 @@ class swift::dispersion ( path => ['/bin', '/usr/bin'], subscribe => File['/etc/swift/dispersion.conf'], 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: '", 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'], } diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 05549d49..5573eb51 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -188,7 +188,8 @@ class swift::keystone::auth( } 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 {