openstack
/
puppet-neutron
Code Issues Proposed changes

Fix lint 

The libraries jobs fails with:
manifests/params.pp:9:ERROR: two-space soft tabs not used

Conflicts:
	manifests/params.pp

Backport note:
This patch also fixes lint issues in the following class.
 neutron::plugins::ml2::cisco::nexus_creds
This lint issue with this class has been fixed in another patch during
train cycle so this change is stable-only one.

Change-Id: If031ef28276d6f52c429844156cdec3c009e033f
Closes-Bug: #1806790
(cherry picked from commit 61b26933f7)
This commit is contained in:
ZhongShengping 2018-12-12 08:49:20 +08:00 committed by Takashi Kajinami
parent 37edd6ebd3
commit 567d32427a
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/plugins/ml2.pp
View File

@ -158,9 +158,11 @@ class neutron::plugins::ml2 (
warning('Security groups will not work without properly set firewall_driver') warning('Security groups will not work without properly set firewall_driver')
} }
# lint:ignore:only_variable_string
if !is_service_default($overlay_ip_version) and !("${overlay_ip_version}" in ['4', '6']) { if !is_service_default($overlay_ip_version) and !("${overlay_ip_version}" in ['4', '6']) {
fail('Invalid IP version for overlay_ip_version') fail('Invalid IP version for overlay_ip_version')
} }
# lint:endignore
if $::operatingsystem == 'Ubuntu' { if $::operatingsystem == 'Ubuntu' {
file_line { '/etc/default/neutron-server:NEUTRON_PLUGIN_CONFIG': file_line { '/etc/default/neutron-server:NEUTRON_PLUGIN_CONFIG':

2
manifests/plugins/ml2/cisco/nexus_creds.pp
View File

@ -114,9 +114,9 @@ define neutron::plugins::ml2::cisco::nexus_creds(
$username, $username,
$password, $password,
$servers, $servers,
$ssh_port = undef,
# Used parameters # Used parameters
$ip_address, $ip_address,
$ssh_port = undef,
$nve_src_intf = undef, $nve_src_intf = undef,
$physnet = undef, $physnet = undef,
$vpc_pool = undef, $vpc_pool = undef,

2
manifests/plugins/ml2/cisco/nexus_switch.pp
View File

@ -123,7 +123,7 @@ define neutron::plugins::ml2::cisco::nexus_switch(
include ::neutron::deps include ::neutron::deps
$section = "ML2_MECH_CISCO_NEXUS:${ip_address}" $section = "ML2_MECH_CISCO_NEXUS:${ip_address}"
$port_mappings = template("neutron/nexus_switch_port_mappings.erb") $port_mappings = template('neutron/nexus_switch_port_mappings.erb')
neutron_plugin_ml2 { neutron_plugin_ml2 {
"${section}/username": value => $username; "${section}/username": value => $username;
"${section}/password": value => $password, secret => true; "${section}/password": value => $password, secret => true;

4
manifests/plugins/ovs/opendaylight.pp
View File

@ -87,6 +87,10 @@
# (optional) CA Certificate file path to use for TLS configuration # (optional) CA Certificate file path to use for TLS configuration
# Defaults to False. # Defaults to False.
# #
# [*enable_ipv6*]
# (optional) If we should enable ipv6.
# Defaults to False.
#
class neutron::plugins::ovs::opendaylight ( class neutron::plugins::ovs::opendaylight (
$tunnel_ip, $tunnel_ip,
$odl_username, $odl_username,