From 567d32427a57d0c5289d138f567b74e7a1625e70 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Wed, 12 Dec 2018 08:49:20 +0800
Subject: [PATCH] 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 61b26933f71c8b4a0f5041bb34619392ca90b507)
---
 manifests/plugins/ml2.pp                    | 2 ++
 manifests/plugins/ml2/cisco/nexus_creds.pp  | 2 +-
 manifests/plugins/ml2/cisco/nexus_switch.pp | 2 +-
 manifests/plugins/ovs/opendaylight.pp       | 4 ++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/manifests/plugins/ml2.pp b/manifests/plugins/ml2.pp
index 7ad456870..23ab2c261 100644
--- a/manifests/plugins/ml2.pp
+++ b/manifests/plugins/ml2.pp
@@ -158,9 +158,11 @@ class neutron::plugins::ml2 (
     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']) {
     fail('Invalid IP version for overlay_ip_version')
   }
+  # lint:endignore
 
   if $::operatingsystem == 'Ubuntu' {
     file_line { '/etc/default/neutron-server:NEUTRON_PLUGIN_CONFIG':
diff --git a/manifests/plugins/ml2/cisco/nexus_creds.pp b/manifests/plugins/ml2/cisco/nexus_creds.pp
index d59161852..1c6927d40 100644
--- a/manifests/plugins/ml2/cisco/nexus_creds.pp
+++ b/manifests/plugins/ml2/cisco/nexus_creds.pp
@@ -114,9 +114,9 @@ define neutron::plugins::ml2::cisco::nexus_creds(
   $username,
   $password,
   $servers,
-  $ssh_port     = undef,
   # Used parameters
   $ip_address,
+  $ssh_port     = undef,
   $nve_src_intf = undef,
   $physnet      = undef,
   $vpc_pool     = undef,
diff --git a/manifests/plugins/ml2/cisco/nexus_switch.pp b/manifests/plugins/ml2/cisco/nexus_switch.pp
index 0bd846b96..8fae9e269 100644
--- a/manifests/plugins/ml2/cisco/nexus_switch.pp
+++ b/manifests/plugins/ml2/cisco/nexus_switch.pp
@@ -123,7 +123,7 @@ define neutron::plugins::ml2::cisco::nexus_switch(
   include ::neutron::deps
 
   $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 {
     "${section}/username":       value => $username;
     "${section}/password":       value => $password, secret => true;
diff --git a/manifests/plugins/ovs/opendaylight.pp b/manifests/plugins/ovs/opendaylight.pp
index 44c7ac080..ceef7cf6e 100644
--- a/manifests/plugins/ovs/opendaylight.pp
+++ b/manifests/plugins/ovs/opendaylight.pp
@@ -87,6 +87,10 @@
 #   (optional) CA Certificate file path to use for TLS configuration
 #   Defaults to False.
 #
+# [*enable_ipv6*]
+#   (optional) If we should enable ipv6.
+#   Defaults to False.
+#
 class neutron::plugins::ovs::opendaylight (
   $tunnel_ip,
   $odl_username,