Merge "Fix lint"

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':

manifests/plugins/ml2/cisco/nexus_switch.pp

@@ -116,7 +116,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;

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,