openstack/puppet-neutron
Code Issues Proposed changes

Merge "Fix lint"

Browse Source
This commit is contained in:
Zuul
2018-12-18 19:12:58 +00:00
committed by Gerrit Code Review
parent 8456be884c 61b26933f7
commit 228b2aab49
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/params.pp
View File

@@ -6,7 +6,7 @@ class neutron::params {
include ::openstacklib::defaults include ::openstacklib::defaults
if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) { ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
$pyvers = '3' $pyvers = '3'
} else { } else {
$pyvers = '' $pyvers = ''

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_switch.pp
View File

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