openstack
/
puppet-neutron
Code Issues Proposed changes

Merge "Fix puppet-lint before upgrading gem"

This commit is contained in:
Jenkins 2016-09-19 12:19:26 +00:00 committed by Gerrit Code Review
parent 7ccc7c4f47 d7b600de26
commit 81712bb1de
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/init.pp
View File

@ -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')
}

1
manifests/quota.pp
View File

@ -111,7 +111,6 @@ class neutron::quota (
$quota_vip = $::os_service_default,
#DEPRECATED PAMAMETERS
$quota_items = undef,
) {
include ::neutron::deps

4
manifests/server.pp
View File

@ -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) {

3
manifests/services/lbaas.pp
View File

@ -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 {

3
manifests/services/vpnaas.pp
View File

@ -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