From d7b600de26bdb78e4404fd82235e563dbbd9a7d3 Mon Sep 17 00:00:00 2001 From: Carlos Camacho Date: Wed, 14 Sep 2016 11:40:21 +0200 Subject: [PATCH] Fix puppet-lint before upgrading gem Removing puppet-lint warnings in favor of upgrading to latest gem 2016-09-13 21:07:38.653168 | manifests/init.pp:31:WARNING: line has more than 140 characters 2016-09-13 21:07:38.653387 | manifests/init.pp:494:WARNING: line has more than 140 characters 2016-09-13 21:07:38.653444 | manifests/init.pp:497:WARNING: line has more than 140 characters 2016-09-13 21:07:38.653490 | manifests/quota.pp:114:ERROR: trailing whitespace found 2016-09-13 21:07:38.653539 | manifests/server.pp:398:WARNING: line has more than 140 characters 2016-09-13 21:07:38.653591 | manifests/services/lbaas.pp:90:WARNING: line has more than 140 characters 2016-09-13 21:07:38.653645 | manifests/services/vpnaas.pp:48:WARNING: line has more than 140 characters Change-Id: Id3683aa33e81a91d306632e7435ffb9d3cd88192 --- manifests/init.pp | 9 ++++++--- manifests/quota.pp | 1 - manifests/server.pp | 4 +++- manifests/services/lbaas.pp | 3 ++- manifests/services/vpnaas.pp | 3 ++- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index a64a106c1..4912df268 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -28,7 +28,8 @@ # [*core_plugin*] # (optional) Neutron plugin provider # Defaults to openvswitch -# Could be bigswitch, brocade, cisco, embrane, hyperv, linuxbridge, midonet, ml2, mlnx, nec, nicira, plumgrid, ryu, nuage, opencontrail (full path) +# Could be bigswitch, brocade, cisco, embrane, hyperv, linuxbridge, midonet, +# ml2, mlnx, nec, nicira, plumgrid, ryu, nuage, opencontrail (full path) # # Example for opencontrail: # @@ -491,10 +492,12 @@ class neutron ( } } - if (is_service_default($kombu_ssl_certfile) and ! is_service_default($kombu_ssl_keyfile)) or (is_service_default($kombu_ssl_keyfile) and ! is_service_default($kombu_ssl_certfile)) { + if (is_service_default($kombu_ssl_certfile) and ! is_service_default($kombu_ssl_keyfile)) + or (is_service_default($kombu_ssl_keyfile) and ! is_service_default($kombu_ssl_certfile)) { fail('The kombu_ssl_certfile and kombu_ssl_keyfile parameters must be used together') } - if ! is_service_default($kombu_missing_consumer_retry_timeout) and ! is_service_default($rpc_response_timeout) and ($kombu_missing_consumer_retry_timeout > $rpc_response_timeout) { + if ! is_service_default($kombu_missing_consumer_retry_timeout) and ! is_service_default($rpc_response_timeout) + and ($kombu_missing_consumer_retry_timeout > $rpc_response_timeout) { warning('kombu_missing_consumer_retry_timeout should not be longer than rpc_response_timeout') } diff --git a/manifests/quota.pp b/manifests/quota.pp index 1e60d5ca5..9be315aee 100644 --- a/manifests/quota.pp +++ b/manifests/quota.pp @@ -111,7 +111,6 @@ class neutron::quota ( $quota_vip = $::os_service_default, #DEPRECATED PAMAMETERS $quota_items = undef, - ) { include ::neutron::deps diff --git a/manifests/server.pp b/manifests/server.pp index fc5af5a10..a83c042fe 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -395,7 +395,9 @@ class neutron::server ( } if !is_service_default($dhcp_load_type) { - validate_re($dhcp_load_type, ['^networks$', '^subnets$', '^ports$'], 'Must pass either networks, subnets, or ports as values for dhcp_load_type') + validate_re($dhcp_load_type, + ['^networks$', '^subnets$', '^ports$'], + 'Must pass either networks, subnets, or ports as values for dhcp_load_type') } if !is_service_default($service_providers) { diff --git a/manifests/services/lbaas.pp b/manifests/services/lbaas.pp index 180c84d0d..04dfbb879 100644 --- a/manifests/services/lbaas.pp +++ b/manifests/services/lbaas.pp @@ -87,7 +87,8 @@ class neutron::services::lbaas ( } if !is_service_default($service_providers) { - warning('service_providers in neutron::services::lbaas is deprecated in newton release, please use service provider in neutron::server class') + warning('service_providers in neutron::services::lbaas is deprecated in newton \ + release, please use service provider in neutron::server class') } if $package_ensure { diff --git a/manifests/services/vpnaas.pp b/manifests/services/vpnaas.pp index ba5e0d6d3..561e84298 100644 --- a/manifests/services/vpnaas.pp +++ b/manifests/services/vpnaas.pp @@ -45,7 +45,8 @@ class neutron::services::vpnaas ( include ::neutron::params if !is_service_default($service_providers) { - warning('service_providers in neutron::services::vpnaas is deprecated in newton release, please use service provider in neutron::server class') + warning('service_providers in neutron::services::vpnaas is deprecated in newton release, \ + please use service provider in neutron::server class') } # agent package contains both agent and service resources