Prepare for voxpupuli-puppet-lint-plugins

Fix new lint errors detected when full of the voxpupili lint plugins
are enabled.

Change-Id: Ie866db54a2c8f1f7b2bfa67077934118cdf7ffa3
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-20 01:20:38 +09:00
parent db8d3d66bd
commit d32c6f9e0a
63 changed files with 36 additions and 108 deletions

View File

@@ -23,7 +23,7 @@
# sudo pcs constraint colocation add neutron_server_service with neutron_vip # sudo pcs constraint colocation add neutron_server_service with neutron_vip
class { 'neutron': class { 'neutron':
service_plugins => [ 'dhcp', 'l3' ], service_plugins => ['dhcp', 'l3'],
} }
class { 'neutron::server': class { 'neutron::server':
@@ -42,4 +42,3 @@ class { 'neutron::agents::l3':
enabled => false, enabled => false,
manage_service => false, manage_service => false,
} }

View File

@@ -94,7 +94,6 @@ class neutron::agents::bagpipe (
Boolean $purge_config = false, Boolean $purge_config = false,
$local_address = $facts['networking']['ip'], $local_address = $facts['networking']['ip'],
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -45,7 +45,7 @@
# (Optional) Whether to set only the specified config options in the BGP dragent config. # (Optional) Whether to set only the specified config options in the BGP dragent config.
# Defaults to false # Defaults to false
# #
class neutron::agents::bgp_dragent( class neutron::agents::bgp_dragent (
$package_ensure = 'present', $package_ensure = 'present',
Boolean $enabled = true, Boolean $enabled = true,
Boolean $manage_service = true, Boolean $manage_service = true,
@@ -53,7 +53,6 @@ class neutron::agents::bgp_dragent(
$bgp_router_id = $facts['networking']['ip'], $bgp_router_id = $facts['networking']['ip'],
Boolean $purge_config = false, Boolean $purge_config = false,
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -161,7 +161,6 @@ class neutron::agents::dhcp (
$report_interval = $facts['os_service_default'], $report_interval = $facts['os_service_default'],
$rpc_response_max_timeout = $facts['os_service_default'], $rpc_response_max_timeout = $facts['os_service_default'],
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -36,7 +36,6 @@ class neutron::agents::fwaas (
$firewall_l2_driver = $facts['os_service_default'], $firewall_l2_driver = $facts['os_service_default'],
Boolean $purge_config = false, Boolean $purge_config = false,
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -1,7 +1,6 @@
# == Class: neutron::agents::l2gw # == Class: neutron::agents::l2gw
# #
# Installs and configures the Neutron L2gw service # Installs and configures the Neutron L2gw service
# #
# === Parameters # === Parameters
# #
@@ -85,7 +84,6 @@ class neutron::agents::l2gw (
$socket_timeout = '30', $socket_timeout = '30',
Boolean $purge_config = false, Boolean $purge_config = false,
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -217,7 +217,6 @@ class neutron::agents::l3 (
$network_log_local_output_log_base = $facts['os_service_default'], $network_log_local_output_log_base = $facts['os_service_default'],
Boolean $purge_config = false, Boolean $purge_config = false,
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -95,7 +95,6 @@ class neutron::agents::metadata (
$rpc_response_max_timeout = $facts['os_service_default'], $rpc_response_max_timeout = $facts['os_service_default'],
Boolean $purge_config = false, Boolean $purge_config = false,
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -78,7 +78,6 @@ class neutron::agents::metering (
$agent_report_interval = $facts['os_service_default'], $agent_report_interval = $facts['os_service_default'],
Boolean $purge_config = false, Boolean $purge_config = false,
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -39,7 +39,6 @@ class neutron::agents::ml2::macvtap (
Array $physical_interface_mappings = [], Array $physical_interface_mappings = [],
Boolean $purge_config = false, Boolean $purge_config = false,
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -124,7 +124,6 @@ class neutron::agents::ml2::networking_baremetal (
Boolean $purge_config = false, Boolean $purge_config = false,
$report_interval = $facts['os_service_default'], $report_interval = $facts['os_service_default'],
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params
@@ -181,5 +180,4 @@ class neutron::agents::ml2::networking_baremetal (
} }
Ironic_neutron_agent_config<||> ~> Service['ironic-neutron-agent-service'] Ironic_neutron_agent_config<||> ~> Service['ironic-neutron-agent-service']
} }
} }

View File

@@ -129,7 +129,6 @@ class neutron::agents::ml2::ovn (
$state_path = $facts['os_service_default'], $state_path = $facts['os_service_default'],
Boolean $purge_config = false, Boolean $purge_config = false,
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -337,7 +337,6 @@ class neutron::agents::ml2::ovs (
$network_log_local_output_log_base = $facts['os_service_default'], $network_log_local_output_log_base = $facts['os_service_default'],
$openflow_processed_per_port = $facts['os_service_default'], $openflow_processed_per_port = $facts['os_service_default'],
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params
@@ -407,10 +406,10 @@ class neutron::agents::ml2::ovs (
} }
if ($manage_vswitch) { if ($manage_vswitch) {
neutron::plugins::ovs::bridge{ $bridge_mappings_real: neutron::plugins::ovs::bridge { $bridge_mappings_real:
before => Service['neutron-ovs-agent-service'], before => Service['neutron-ovs-agent-service'],
} }
neutron::plugins::ovs::port{ $bridge_uplinks: neutron::plugins::ovs::port { $bridge_uplinks:
before => Service['neutron-ovs-agent-service'], before => Service['neutron-ovs-agent-service'],
} }
} }
@@ -424,26 +423,26 @@ class neutron::agents::ml2::ovs (
} }
} }
if ($resource_provider_bandwidths != []) { if $resource_provider_bandwidths != [] {
$resource_provider_bandwidths_real = join(any2array($resource_provider_bandwidths), ',') $resource_provider_bandwidths_real = join(any2array($resource_provider_bandwidths), ',')
} else { } else {
$resource_provider_bandwidths_real = $facts['os_service_default'] $resource_provider_bandwidths_real = $facts['os_service_default']
} }
if ($resource_provider_hypervisors != []){ if $resource_provider_hypervisors != [] {
$resource_provider_hypervisors_real = join(any2array($resource_provider_hypervisors), ',') $resource_provider_hypervisors_real = join(any2array($resource_provider_hypervisors), ',')
} else { } else {
$resource_provider_hypervisors_real = $facts['os_service_default'] $resource_provider_hypervisors_real = $facts['os_service_default']
} }
if ($resource_provider_packet_processing_without_direction != []){ if $resource_provider_packet_processing_without_direction != [] {
$resource_provider_packet_processing_without_direction_real = $resource_provider_packet_processing_without_direction_real =
join(any2array($resource_provider_packet_processing_without_direction), ',') join(any2array($resource_provider_packet_processing_without_direction), ',')
} else { } else {
$resource_provider_packet_processing_without_direction_real = $facts['os_service_default'] $resource_provider_packet_processing_without_direction_real = $facts['os_service_default']
} }
if ($resource_provider_packet_processing_with_direction != []){ if $resource_provider_packet_processing_with_direction != [] {
$resource_provider_packet_processing_with_direction_real = $resource_provider_packet_processing_with_direction_real =
join(any2array($resource_provider_packet_processing_with_direction), ',') join(any2array($resource_provider_packet_processing_with_direction), ',')
} else { } else {
@@ -453,7 +452,7 @@ class neutron::agents::ml2::ovs (
if empty($resource_provider_inventory_defaults) { if empty($resource_provider_inventory_defaults) {
$resource_provider_inventory_defaults_real = $facts['os_service_default'] $resource_provider_inventory_defaults_real = $facts['os_service_default']
} else { } else {
if ($resource_provider_inventory_defaults =~ Hash){ if $resource_provider_inventory_defaults =~ Hash {
$resource_provider_inventory_defaults_real = $resource_provider_inventory_defaults_real =
join(join_keys_to_values($resource_provider_inventory_defaults, ':'), ',') join(join_keys_to_values($resource_provider_inventory_defaults, ':'), ',')
} else { } else {
@@ -465,7 +464,7 @@ class neutron::agents::ml2::ovs (
if empty($resource_provider_packet_processing_inventory_defaults) { if empty($resource_provider_packet_processing_inventory_defaults) {
$resource_provider_packet_processing_inventory_defaults_real = $facts['os_service_default'] $resource_provider_packet_processing_inventory_defaults_real = $facts['os_service_default']
} else { } else {
if ($resource_provider_packet_processing_inventory_defaults =~ Hash){ if $resource_provider_packet_processing_inventory_defaults =~ Hash {
$resource_provider_packet_processing_inventory_defaults_real = $resource_provider_packet_processing_inventory_defaults_real =
join(join_keys_to_values($resource_provider_packet_processing_inventory_defaults, ':'), ',') join(join_keys_to_values($resource_provider_packet_processing_inventory_defaults, ':'), ',')
} else { } else {

View File

@@ -114,7 +114,6 @@ class neutron::agents::ml2::sriov (
$resource_provider_default_hypervisor = $facts['os_service_default'], $resource_provider_default_hypervisor = $facts['os_service_default'],
$resource_provider_inventory_defaults = {}, $resource_provider_inventory_defaults = {},
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params
@@ -160,13 +159,13 @@ class neutron::agents::ml2::sriov (
Neutron_agent_sriov_numvfs<||> ~> Service['neutron-sriov-nic-agent-service'] Neutron_agent_sriov_numvfs<||> ~> Service['neutron-sriov-nic-agent-service']
} }
if ($resource_provider_bandwidths != []) { if $resource_provider_bandwidths != [] {
$resource_provider_bandwidths_real = join(any2array($resource_provider_bandwidths), ',') $resource_provider_bandwidths_real = join(any2array($resource_provider_bandwidths), ',')
} else { } else {
$resource_provider_bandwidths_real = $facts['os_service_default'] $resource_provider_bandwidths_real = $facts['os_service_default']
} }
if ($resource_provider_hypervisors != []) { if $resource_provider_hypervisors != [] {
$resource_provider_hypervisors_real = join(any2array($resource_provider_hypervisors), ',') $resource_provider_hypervisors_real = join(any2array($resource_provider_hypervisors), ',')
} else { } else {
$resource_provider_hypervisors_real = $facts['os_service_default'] $resource_provider_hypervisors_real = $facts['os_service_default']
@@ -175,7 +174,7 @@ class neutron::agents::ml2::sriov (
if empty($resource_provider_inventory_defaults) { if empty($resource_provider_inventory_defaults) {
$resource_provider_inventory_defaults_real = $facts['os_service_default'] $resource_provider_inventory_defaults_real = $facts['os_service_default']
} else { } else {
if ($resource_provider_inventory_defaults =~ Hash){ if $resource_provider_inventory_defaults =~ Hash {
$resource_provider_inventory_defaults_real = join(join_keys_to_values($resource_provider_inventory_defaults, ':'), ',') $resource_provider_inventory_defaults_real = join(join_keys_to_values($resource_provider_inventory_defaults, ':'), ',')
} else { } else {
$resource_provider_inventory_defaults_real = join(any2array($resource_provider_inventory_defaults), ',') $resource_provider_inventory_defaults_real = join(any2array($resource_provider_inventory_defaults), ',')
@@ -188,5 +187,4 @@ class neutron::agents::ml2::sriov (
'sriov_nic/resource_provider_default_hypervisor': value => $resource_provider_default_hypervisor; 'sriov_nic/resource_provider_default_hypervisor': value => $resource_provider_default_hypervisor;
'sriov_nic/resource_provider_inventory_defaults': value => $resource_provider_inventory_defaults_real; 'sriov_nic/resource_provider_inventory_defaults': value => $resource_provider_inventory_defaults_real;
} }
} }

View File

@@ -149,7 +149,6 @@ class neutron::agents::ovn_metadata (
$state_path = $facts['os_service_default'], $state_path = $facts['os_service_default'],
Boolean $purge_config = false, Boolean $purge_config = false,
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -27,7 +27,6 @@ class neutron::agents::taas (
$package_ensure = present, $package_ensure = present,
$taas_agent_periodic_interval = $facts['os_service_default'], $taas_agent_periodic_interval = $facts['os_service_default'],
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -47,7 +47,6 @@ class neutron::agents::vpnaas (
$ipsec_status_check_interval = $facts['os_service_default'], $ipsec_status_check_interval = $facts['os_service_default'],
Boolean $purge_config = false, Boolean $purge_config = false,
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -98,7 +98,6 @@ class neutron::agents::vpnaas::ovn (
$ovsdb_probe_interval = $facts['os_service_default'], $ovsdb_probe_interval = $facts['os_service_default'],
Boolean $purge_config = false, Boolean $purge_config = false,
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -259,7 +259,6 @@ class neutron::cache (
$dead_timeout = $facts['os_service_default'], $dead_timeout = $facts['os_service_default'],
Boolean $manage_backend_package = true, Boolean $manage_backend_package = true,
) { ) {
include neutron::deps include neutron::deps
oslo::cache { 'neutron_config': oslo::cache { 'neutron_config':

View File

@@ -11,7 +11,6 @@
class neutron::client ( class neutron::client (
$package_ensure = present $package_ensure = present
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params
@@ -25,5 +24,4 @@ in a future release.")
} }
include openstacklib::openstackclient include openstacklib::openstackclient
} }

View File

@@ -129,7 +129,6 @@ class neutron::config (
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
Optional[Hash] $ovn_metadata_agent_config = undef, Optional[Hash] $ovn_metadata_agent_config = undef,
) { ) {
include neutron::deps include neutron::deps
create_resources('neutron_config', $server_config) create_resources('neutron_config', $server_config)

View File

@@ -44,7 +44,6 @@ class neutron::cors (
$allow_methods = $facts['os_service_default'], $allow_methods = $facts['os_service_default'],
$allow_headers = $facts['os_service_default'], $allow_headers = $facts['os_service_default'],
) { ) {
include neutron::deps include neutron::deps
oslo::cors { 'neutron_config': oslo::cors { 'neutron_config':

View File

@@ -54,7 +54,6 @@ class neutron::db (
$mysql_enable_ndb = $facts['os_service_default'], $mysql_enable_ndb = $facts['os_service_default'],
$database_db_max_retries = $facts['os_service_default'], $database_db_max_retries = $facts['os_service_default'],
) { ) {
include neutron::deps include neutron::deps
if $database_connection { if $database_connection {
@@ -69,7 +68,6 @@ class neutron::db (
mysql_enable_ndb => $mysql_enable_ndb, mysql_enable_ndb => $mysql_enable_ndb,
db_max_retries => $database_db_max_retries, db_max_retries => $database_db_max_retries,
} }
} }
# all db settings should be applied and all packages should be installed # all db settings should be applied and all packages should be installed

View File

@@ -39,7 +39,6 @@ class neutron::db::mysql (
$charset = 'utf8', $charset = 'utf8',
$collate = 'utf8_general_ci', $collate = 'utf8_general_ci',
) { ) {
include neutron::deps include neutron::deps
openstacklib::db::mysql { 'neutron': openstacklib::db::mysql { 'neutron':

View File

@@ -24,14 +24,13 @@
# (Optional) Privileges given to the database user. # (Optional) Privileges given to the database user.
# Default to 'ALL' # Default to 'ALL'
# #
class neutron::db::postgresql( class neutron::db::postgresql (
$password, $password,
$dbname = 'neutron', $dbname = 'neutron',
$user = 'neutron', $user = 'neutron',
$encoding = undef, $encoding = undef,
$privileges = 'ALL', $privileges = 'ALL',
) { ) {
include neutron::deps include neutron::deps
openstacklib::db::postgresql { 'neutron': openstacklib::db::postgresql { 'neutron':

View File

@@ -14,11 +14,10 @@
# (Optional) Timeout for the execution of the db_sync # (Optional) Timeout for the execution of the db_sync
# Defaults to 300 # Defaults to 300
# #
class neutron::db::sync( class neutron::db::sync (
$extra_params = '', $extra_params = '',
$db_sync_timeout = 300, $db_sync_timeout = 300,
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -91,7 +91,7 @@ class neutron::designate (
include neutron::deps include neutron::deps
include neutron::params include neutron::params
if is_service_default($system_scope){ if is_service_default($system_scope) {
$project_name_real = $project_name $project_name_real = $project_name
$project_domain_name_real = $project_domain_name $project_domain_name_real = $project_domain_name
} else { } else {

View File

@@ -46,7 +46,6 @@ class neutron::healthcheck (
$disable_by_file_paths = $facts['os_service_default'], $disable_by_file_paths = $facts['os_service_default'],
$enable_by_file_paths = $facts['os_service_default'], $enable_by_file_paths = $facts['os_service_default'],
) { ) {
include neutron::deps include neutron::deps
oslo::healthcheck { 'neutron_config': oslo::healthcheck { 'neutron_config':

View File

@@ -365,7 +365,6 @@ class neutron (
$vlan_transparent = undef, $vlan_transparent = undef,
$vlan_qinq = undef, $vlan_qinq = undef,
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params
@@ -440,7 +439,7 @@ will be removed in a future release")
'DEFAULT/service_plugins': value => join(any2array($service_plugins), ','); 'DEFAULT/service_plugins': value => join(any2array($service_plugins), ',');
} }
oslo::messaging::rabbit {'neutron_config': oslo::messaging::rabbit { 'neutron_config':
heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold, heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold,
heartbeat_rate => $rabbit_heartbeat_rate, heartbeat_rate => $rabbit_heartbeat_rate,
heartbeat_in_pthread => $rabbit_heartbeat_in_pthread, heartbeat_in_pthread => $rabbit_heartbeat_in_pthread,
@@ -477,5 +476,4 @@ will be removed in a future release")
key_file => $key_file, key_file => $key_file,
ca_file => $ca_file, ca_file => $ca_file,
} }
} }

View File

@@ -106,7 +106,6 @@ class neutron::keystone::auth (
Keystone::EndpointUrl $admin_url = 'http://127.0.0.1:9696', Keystone::EndpointUrl $admin_url = 'http://127.0.0.1:9696',
Keystone::EndpointUrl $internal_url = 'http://127.0.0.1:9696', Keystone::EndpointUrl $internal_url = 'http://127.0.0.1:9696',
) { ) {
include neutron::deps include neutron::deps
Keystone::Resource::Service_identity['neutron'] -> Anchor['neutron::service::end'] Keystone::Resource::Service_identity['neutron'] -> Anchor['neutron::service::end']
@@ -131,5 +130,4 @@ class neutron::keystone::auth (
admin_url => $admin_url, admin_url => $admin_url,
internal_url => $internal_url, internal_url => $internal_url,
} }
} }

View File

@@ -194,7 +194,7 @@
# (Optional) Hash of additional parameters to pass through to the keystone # (Optional) Hash of additional parameters to pass through to the keystone
# authtoken class. Values set here override the individual parameters above. # authtoken class. Values set here override the individual parameters above.
# #
class neutron::keystone::authtoken( class neutron::keystone::authtoken (
String[1] $password, String[1] $password,
$username = 'neutron', $username = 'neutron',
$auth_url = 'http://localhost:5000', $auth_url = 'http://localhost:5000',
@@ -234,7 +234,6 @@ class neutron::keystone::authtoken(
$interface = $facts['os_service_default'], $interface = $facts['os_service_default'],
$params = {}, $params = {},
) { ) {
include neutron::deps include neutron::deps
keystone::resource::authtoken { keystone::resource::authtoken {

View File

@@ -123,7 +123,6 @@ class neutron::logging (
$instance_uuid_format = $facts['os_service_default'], $instance_uuid_format = $facts['os_service_default'],
$fatal_deprecations = $facts['os_service_default'], $fatal_deprecations = $facts['os_service_default'],
) { ) {
include neutron::deps include neutron::deps
oslo::log { 'neutron_config': oslo::log { 'neutron_config':
@@ -148,5 +147,4 @@ class neutron::logging (
instance_uuid_format => $instance_uuid_format, instance_uuid_format => $instance_uuid_format,
fatal_deprecations => $fatal_deprecations, fatal_deprecations => $fatal_deprecations,
} }
} }

View File

@@ -140,7 +140,6 @@ class neutron::plugins::ml2 (
$max_header_size = $facts['os_service_default'], $max_header_size = $facts['os_service_default'],
$overlay_ip_version = $facts['os_service_default'], $overlay_ip_version = $facts['os_service_default'],
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -52,7 +52,7 @@
# property for a package resource type. # property for a package resource type.
# Defaults to 'present' # Defaults to 'present'
# #
class neutron::plugins::ml2::arista( class neutron::plugins::ml2::arista (
$eapi_host, $eapi_host,
$eapi_username, $eapi_username,
$eapi_password, $eapi_password,
@@ -62,7 +62,6 @@ class neutron::plugins::ml2::arista(
$use_fqdn = $facts['os_service_default'], $use_fqdn = $facts['os_service_default'],
$package_ensure = 'present' $package_ensure = 'present'
) { ) {
include neutron::deps include neutron::deps
require neutron::plugins::ml2 require neutron::plugins::ml2

View File

@@ -50,7 +50,7 @@
# (optional) If it should create a router in VRF. # (optional) If it should create a router in VRF.
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
class neutron::plugins::ml2::arista::l3( class neutron::plugins::ml2::arista::l3 (
$primary_l3_host, $primary_l3_host,
$primary_l3_host_username, $primary_l3_host_username,
$primary_l3_host_password, $primary_l3_host_password,
@@ -60,7 +60,6 @@ class neutron::plugins::ml2::arista::l3(
$conn_timeout = $facts['os_service_default'], $conn_timeout = $facts['os_service_default'],
$use_vrf = $facts['os_service_default'], $use_vrf = $facts['os_service_default'],
) { ) {
include neutron::deps include neutron::deps
require neutron::plugins::ml2 require neutron::plugins::ml2

View File

@@ -38,7 +38,6 @@ class neutron::plugins::ml2::bagpipe (
$mpls_bridge = $facts['os_service_default'], $mpls_bridge = $facts['os_service_default'],
$package_ensure = 'present', $package_ensure = 'present',
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params
require neutron::plugins::ml2 require neutron::plugins::ml2

View File

@@ -10,10 +10,9 @@
# property for a package resource type. # property for a package resource type.
# Defaults to 'present' # Defaults to 'present'
# #
class neutron::plugins::ml2::networking_baremetal( class neutron::plugins::ml2::networking_baremetal (
$package_ensure = 'present', $package_ensure = 'present',
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -197,7 +197,7 @@
# Type: boolean # Type: boolean
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
class neutron::plugins::ml2::ovn( class neutron::plugins::ml2::ovn (
$ovn_nb_connection = $facts['os_service_default'], $ovn_nb_connection = $facts['os_service_default'],
$ovn_sb_connection = $facts['os_service_default'], $ovn_sb_connection = $facts['os_service_default'],
$ovn_nb_private_key = $facts['os_service_default'], $ovn_nb_private_key = $facts['os_service_default'],
@@ -237,7 +237,6 @@ class neutron::plugins::ml2::ovn(
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$ovn_emit_need_to_frag = undef, $ovn_emit_need_to_frag = undef,
) { ) {
include neutron::deps include neutron::deps
require neutron::plugins::ml2 require neutron::plugins::ml2
@@ -245,7 +244,7 @@ class neutron::plugins::ml2::ovn(
warning('The ovn_emit_need_to_frag parameter has been deprecated.') warning('The ovn_emit_need_to_frag parameter has been deprecated.')
} }
if ! ( $neutron_sync_mode in ['off', 'log', 'repair', $facts['os_service_default']] ) { if !($neutron_sync_mode in ['off', 'log', 'repair', $facts['os_service_default']]) {
fail( 'Invalid value for neutron_sync_mode parameter' ) fail( 'Invalid value for neutron_sync_mode parameter' )
} }

View File

@@ -19,7 +19,6 @@ class neutron::plugins::ml2::ovn::maintenance_worker (
Boolean $enabled = true, Boolean $enabled = true,
Boolean $manage_service = true, Boolean $manage_service = true,
) { ) {
include neutron::params include neutron::params
package { 'neutron-ovn-maintenance-worker': package { 'neutron-ovn-maintenance-worker':

View File

@@ -21,7 +21,7 @@
# #
class neutron::plugins::ml2::ovs_driver ( class neutron::plugins::ml2::ovs_driver (
Array $vnic_type_prohibit_list = [], Array $vnic_type_prohibit_list = [],
){ ) {
if !empty($vnic_type_prohibit_list) { if !empty($vnic_type_prohibit_list) {
neutron_plugin_ml2 { neutron_plugin_ml2 {
'ovs_driver/vnic_type_prohibit_list': value => join($vnic_type_prohibit_list, ','); 'ovs_driver/vnic_type_prohibit_list': value => join($vnic_type_prohibit_list, ',');

View File

@@ -21,7 +21,7 @@
# #
class neutron::plugins::ml2::sriov_driver ( class neutron::plugins::ml2::sriov_driver (
Array $vnic_type_prohibit_list = [], Array $vnic_type_prohibit_list = [],
){ ) {
if !empty($vnic_type_prohibit_list) { if !empty($vnic_type_prohibit_list) {
neutron_plugin_ml2 { neutron_plugin_ml2 {
'sriov_driver/vnic_type_prohibit_list': value => join($vnic_type_prohibit_list, ','); 'sriov_driver/vnic_type_prohibit_list': value => join($vnic_type_prohibit_list, ',');

View File

@@ -50,8 +50,7 @@ define neutron::plugins::ml2::type_driver (
$vni_ranges, $vni_ranges,
$vxlan_group, $vxlan_group,
$max_header_size $max_header_size
){ ) {
include neutron::deps include neutron::deps
case $name { case $name {
@@ -92,11 +91,11 @@ define neutron::plugins::ml2::type_driver (
case $vxlan_group { case $vxlan_group {
/^2[\d.]+$/: { /^2[\d.]+$/: {
case $vxlan_group { case $vxlan_group {
/^(22[4-9]|23[0-9])\.(\d+)\.(\d+)\.(\d+)$/: { } /^(22[4-9]|23[0-9])\.(\d+)\.(\d+)\.(\d+)$/: {}
default: { } default: {}
} }
} }
/^ff[\d.]+$/: { } /^ff[\d.]+$/: {}
default: { default: {
fail("${vxlan_group} is not valid for vxlan_group.") fail("${vxlan_group} is not valid for vxlan_group.")
} }

View File

@@ -1,14 +1,12 @@
# #
define neutron::plugins::ovs::bridge { define neutron::plugins::ovs::bridge {
include neutron::deps include neutron::deps
$mapping = split($name, ':') $mapping = split($name, ':')
$bridge = $mapping[1] $bridge = $mapping[1]
vs_bridge {$bridge: vs_bridge { $bridge:
ensure => present, ensure => present,
external_ids => "bridge-id=${bridge}", external_ids => "bridge-id=${bridge}",
} }
} }

View File

@@ -1,12 +1,9 @@
#
define neutron::plugins::ovs::port { define neutron::plugins::ovs::port {
include neutron::deps include neutron::deps
$mapping = split($name, ':') $mapping = split($name, ':')
vs_port {$mapping[1]: vs_port { $mapping[1]:
ensure => present, ensure => present,
bridge => $mapping[0], bridge => $mapping[0],
} }
} }

View File

@@ -54,7 +54,6 @@ class neutron::policy (
$policy_dirs = $facts['os_service_default'], $policy_dirs = $facts['os_service_default'],
Boolean $purge_config = false, Boolean $purge_config = false,
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params
@@ -82,5 +81,4 @@ class neutron::policy (
policy_default_rule => $policy_default_rule, policy_default_rule => $policy_default_rule,
policy_dirs => $policy_dirs, policy_dirs => $policy_dirs,
} }
} }

View File

@@ -62,7 +62,6 @@ class neutron::quota (
# rbac extension # rbac extension
$quota_rbac_policy = $facts['os_service_default'], $quota_rbac_policy = $facts['os_service_default'],
) { ) {
include neutron::deps include neutron::deps
neutron_config { neutron_config {

View File

@@ -21,7 +21,6 @@ class neutron::quota::fwaas (
$quota_firewall_policy = $facts['os_service_default'], $quota_firewall_policy = $facts['os_service_default'],
$quota_firewall_rule = $facts['os_service_default'], $quota_firewall_rule = $facts['os_service_default'],
) { ) {
include neutron::deps include neutron::deps
neutron_config { neutron_config {

View File

@@ -31,7 +31,6 @@ class neutron::quota::sfc (
$quota_service_graphs = $facts['os_service_default'], $quota_service_graphs = $facts['os_service_default'],
$quota_flow_classifier = $facts['os_service_default'] $quota_flow_classifier = $facts['os_service_default']
) { ) {
include neutron::deps include neutron::deps
neutron_config { neutron_config {

View File

@@ -17,12 +17,11 @@
# is set. # is set.
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
class neutron::reports( class neutron::reports (
$log_dir = $facts['os_service_default'], $log_dir = $facts['os_service_default'],
$file_event_handler = $facts['os_service_default'], $file_event_handler = $facts['os_service_default'],
$file_event_handler_interval = $facts['os_service_default'], $file_event_handler_interval = $facts['os_service_default'],
) { ) {
include neutron::deps include neutron::deps
oslo::reports { 'neutron_config': oslo::reports { 'neutron_config':

View File

@@ -282,13 +282,12 @@ class neutron::server (
$service_name = undef, $service_name = undef,
$server_package = undef, $server_package = undef,
) inherits neutron::params { ) inherits neutron::params {
include neutron::deps include neutron::deps
include neutron::db include neutron::db
include neutron::policy include neutron::policy
if !is_service_default($dhcp_load_type) { if !is_service_default($dhcp_load_type) {
if ! ($dhcp_load_type in ['networks', 'subnets', 'ports'] ) { if ! ($dhcp_load_type in ['networks', 'subnets', 'ports']) {
fail('Unsupported dhcp_load_type. It should be one of networks, subnets and ports.') fail('Unsupported dhcp_load_type. It should be one of networks, subnets and ports.')
} }
} }

View File

@@ -29,7 +29,6 @@ class neutron::server::notifications (
$send_events_interval = $facts['os_service_default'], $send_events_interval = $facts['os_service_default'],
$http_retries = $facts['os_service_default'], $http_retries = $facts['os_service_default'],
) { ) {
include neutron::deps include neutron::deps
neutron_config { neutron_config {

View File

@@ -77,7 +77,6 @@ class neutron::server::notifications::ironic (
$valid_interfaces = $facts['os_service_default'], $valid_interfaces = $facts['os_service_default'],
$enable_notifications = $facts['os_service_default'], $enable_notifications = $facts['os_service_default'],
) { ) {
include neutron::deps include neutron::deps
if is_service_default($system_scope) { if is_service_default($system_scope) {

View File

@@ -83,7 +83,6 @@ class neutron::server::notifications::nova (
$region_name = $facts['os_service_default'], $region_name = $facts['os_service_default'],
$endpoint_type = $facts['os_service_default'], $endpoint_type = $facts['os_service_default'],
) { ) {
include neutron::deps include neutron::deps
if is_service_default($system_scope) { if is_service_default($system_scope) {

View File

@@ -72,7 +72,6 @@ class neutron::server::placement (
$region_name = $facts['os_service_default'], $region_name = $facts['os_service_default'],
$endpoint_type = $facts['os_service_default'], $endpoint_type = $facts['os_service_default'],
) { ) {
include neutron::deps include neutron::deps
if is_service_default($system_scope) { if is_service_default($system_scope) {

View File

@@ -43,7 +43,6 @@ class neutron::services::bgpvpn (
Boolean $sync_db = false, Boolean $sync_db = false,
$purge_config = false, $purge_config = false,
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -20,7 +20,6 @@ class neutron::services::dr (
$bgp_drscheduler_driver = $facts['os_service_default'], $bgp_drscheduler_driver = $facts['os_service_default'],
Boolean $sync_db = false, Boolean $sync_db = false,
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -27,7 +27,6 @@ class neutron::services::fwaas (
Boolean $sync_db = false, Boolean $sync_db = false,
Boolean $purge_config = false, Boolean $purge_config = false,
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -52,7 +52,6 @@ class neutron::services::l2gw (
$package_ensure = 'present', $package_ensure = 'present',
Boolean $purge_config = false, Boolean $purge_config = false,
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -62,7 +62,6 @@ class neutron::services::sfc (
$sfc_driver = undef, $sfc_driver = undef,
$fc_driver = undef, $fc_driver = undef,
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -47,7 +47,6 @@ class neutron::services::taas (
Boolean $sync_db = false, Boolean $sync_db = false,
Boolean $purge_config = false, Boolean $purge_config = false,
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -43,7 +43,6 @@ class neutron::services::vpnaas (
Boolean $sync_db = false, Boolean $sync_db = false,
Boolean $purge_config = false, Boolean $purge_config = false,
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -156,7 +156,6 @@ class neutron::wsgi::apache (
$headers = undef, $headers = undef,
$request_headers = undef, $request_headers = undef,
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params

View File

@@ -25,11 +25,10 @@ class neutron::wsgi::uwsgi (
$processes = $facts['os_workers'], $processes = $facts['os_workers'],
$threads = 32, $threads = 32,
$listen_queue_size = 100, $listen_queue_size = 100,
){ ) {
include neutron::deps include neutron::deps
if $facts['os']['name'] != 'Debian'{ if $facts['os']['name'] != 'Debian' {
warning('This class is only valid for Debian, as other operating systems are not using uwsgi by default.') warning('This class is only valid for Debian, as other operating systems are not using uwsgi by default.')
} }