Prepare for voxpupuli-puppet-lint-plugins

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

Change-Id: I3c5704fa87db1cca7f0edd9396eacac6e70438f9
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-19 21:43:09 +09:00
parent c613dc0691
commit f2119ee6e8
85 changed files with 57 additions and 152 deletions

View File

@@ -46,4 +46,3 @@ class { 'nova::vncproxy':
enabled => false, enabled => false,
manage_service => false, manage_service => false,
} }

View File

@@ -166,7 +166,6 @@ class nova::api(
$osapi_compute_workers = undef, $osapi_compute_workers = undef,
$metadata_workers = undef, $metadata_workers = undef,
) inherits nova::params { ) inherits nova::params {
include nova::deps include nova::deps
include nova::db include nova::db
include nova::policy include nova::policy

View File

@@ -21,11 +21,11 @@ class nova::availability_zone (
$default_schedule_zone = $facts['os_service_default'], $default_schedule_zone = $facts['os_service_default'],
$internal_service_availability_zone = $facts['os_service_default'], $internal_service_availability_zone = $facts['os_service_default'],
) { ) {
include nova::deps
nova_config { nova_config {
'DEFAULT/default_availability_zone': value => $default_availability_zone; 'DEFAULT/default_availability_zone': value => $default_availability_zone;
'DEFAULT/default_schedule_zone': value => $default_schedule_zone; 'DEFAULT/default_schedule_zone': value => $default_schedule_zone;
'DEFAULT/internal_service_availability_zone': value => $internal_service_availability_zone; 'DEFAULT/internal_service_availability_zone': value => $internal_service_availability_zone;
} }
} }

View File

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

View File

@@ -11,7 +11,6 @@
class nova::cell_v2::discover_hosts ( class nova::cell_v2::discover_hosts (
$extra_params = '', $extra_params = '',
) { ) {
include nova::deps include nova::deps
include nova::params include nova::params

View File

@@ -14,7 +14,6 @@
class nova::cell_v2::map_cell0 ( class nova::cell_v2::map_cell0 (
$extra_params = '', $extra_params = '',
) { ) {
include nova::deps include nova::deps
include nova::params include nova::params

View File

@@ -11,7 +11,6 @@
class nova::cell_v2::map_cell_and_hosts ( class nova::cell_v2::map_cell_and_hosts (
$extra_params = '', $extra_params = '',
) { ) {
include nova::deps include nova::deps
include nova::params include nova::params

View File

@@ -24,7 +24,6 @@ class nova::cell_v2::map_instances (
$cell_name = undef, $cell_name = undef,
$extra_params = '', $extra_params = '',
) { ) {
include nova::deps include nova::deps
include nova::params include nova::params

View File

@@ -33,9 +33,7 @@ class nova::cell_v2::simple_setup (
$database_connection = 'default', $database_connection = 'default',
$database_connection_cell0 = 'default', $database_connection_cell0 = 'default',
) { ) {
include nova::deps include nova::deps
include nova::cell_v2::map_cell0 include nova::cell_v2::map_cell0
nova_cell_v2 { 'cell0': nova_cell_v2 { 'cell0':
@@ -52,5 +50,4 @@ class nova::cell_v2::simple_setup (
Class['nova::cell_v2::map_cell0'] Class['nova::cell_v2::map_cell0']
-> Nova_cell_v2 <| |> -> Nova_cell_v2 <| |>
~> Class['nova::cell_v2::discover_hosts'] ~> Class['nova::cell_v2::discover_hosts']
} }

View File

@@ -91,7 +91,6 @@ class nova::cinder (
$cross_az_attach = $facts['os_service_default'], $cross_az_attach = $facts['os_service_default'],
$debug = $facts['os_service_default'], $debug = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
if is_service_default($password) { if is_service_default($password) {

View File

@@ -22,5 +22,4 @@ in a future release.")
name => $nova::params::client_package, name => $nova::params::client_package,
tag => 'openstack', tag => 'openstack',
} }
} }

View File

@@ -316,7 +316,6 @@ class nova::compute (
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$config_drive_format = undef, $config_drive_format = undef,
) { ) {
include nova::deps include nova::deps
include nova::params include nova::params

View File

@@ -37,7 +37,6 @@ class nova::compute::image_cache (
$remove_unused_resized_minimum_age_seconds = $facts['os_service_default'], $remove_unused_resized_minimum_age_seconds = $facts['os_service_default'],
$precache_concurrency = $facts['os_service_default'] $precache_concurrency = $facts['os_service_default']
) { ) {
include nova::deps include nova::deps
nova_config { nova_config {

View File

@@ -16,7 +16,6 @@ class nova::compute::ironic (
$ensure_package = 'present', $ensure_package = 'present',
$compute_driver = 'ironic.IronicDriver', $compute_driver = 'ironic.IronicDriver',
) { ) {
include nova::deps include nova::deps
require nova::ironic::common require nova::ironic::common

View File

@@ -291,7 +291,6 @@ class nova::compute::libvirt (
$wait_soft_reboot_seconds = $facts['os_service_default'], $wait_soft_reboot_seconds = $facts['os_service_default'],
$tb_cache_size = $facts['os_service_default'], $tb_cache_size = $facts['os_service_default'],
) inherits nova::params { ) inherits nova::params {
include nova::deps include nova::deps
include nova::params include nova::params

View File

@@ -63,7 +63,6 @@ class nova::compute::libvirt::config (
Hash $virtstoraged_config = {}, Hash $virtstoraged_config = {},
Hash $qemu_config = {}, Hash $qemu_config = {},
) { ) {
include nova::deps include nova::deps
create_resources('libvirtd_config', $libvirtd_config) create_resources('libvirtd_config', $libvirtd_config)

View File

@@ -59,7 +59,6 @@ class nova::compute::libvirt::libvirtd (
$tls_priority = $facts['os_service_default'], $tls_priority = $facts['os_service_default'],
$ovs_timeout = $facts['os_service_default'], $ovs_timeout = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
libvirtd_config { libvirtd_config {

View File

@@ -11,7 +11,6 @@
class nova::compute::libvirt::networks ( class nova::compute::libvirt::networks (
Boolean $disable_default_network = true, Boolean $disable_default_network = true,
) { ) {
include nova::deps include nova::deps
if $disable_default_network { if $disable_default_network {

View File

@@ -63,7 +63,6 @@ class nova::compute::libvirt::qemu(
Boolean $nbd_tls = false, Boolean $nbd_tls = false,
$libvirt_version = $nova::compute::libvirt::version::default, $libvirt_version = $nova::compute::libvirt::version::default,
) inherits nova::compute::libvirt::version { ) inherits nova::compute::libvirt::version {
include nova::deps include nova::deps
if versioncmp($libvirt_version, '4.5') < 0 { if versioncmp($libvirt_version, '4.5') < 0 {
@@ -73,7 +72,6 @@ class nova::compute::libvirt::qemu(
Qemu_config<||> ~> Service<| tag == 'libvirt-qemu-service' |> Qemu_config<||> ~> Service<| tag == 'libvirt-qemu-service' |>
if $configure_qemu { if $configure_qemu {
if $vnc_tls { if $vnc_tls {
$vnc_tls_verify_real = $vnc_tls_verify $vnc_tls_verify_real = $vnc_tls_verify
} else { } else {
@@ -107,7 +105,6 @@ class nova::compute::libvirt::qemu(
} }
qemu_config { 'nbd_tls': value => $nbd_tls } qemu_config { 'nbd_tls': value => $nbd_tls }
} else { } else {
qemu_config { qemu_config {
'max_files': ensure => absent; 'max_files': ensure => absent;

View File

@@ -36,7 +36,6 @@ define nova::compute::libvirt::secret_ceph(
String[1] $secret_name = $name, String[1] $secret_name = $name,
Stdlib::Absolutepath $secret_path = '/etc/nova', Stdlib::Absolutepath $secret_path = '/etc/nova',
) { ) {
$xml_file = "${secret_path}/libvirt-secret-${uuid}.xml" $xml_file = "${secret_path}/libvirt-secret-${uuid}.xml"
file { $xml_file: file { $xml_file:
ensure => file, ensure => file,

View File

@@ -72,7 +72,6 @@ class nova::compute::libvirt::services (
Boolean $manage_ovmf = true, Boolean $manage_ovmf = true,
Boolean $manage_swtpm = false, Boolean $manage_swtpm = false,
) inherits nova::params { ) inherits nova::params {
include nova::deps include nova::deps
include nova::params include nova::params

View File

@@ -45,7 +45,6 @@ class nova::compute::libvirt::virtlockd (
$max_size = $facts['os_service_default'], $max_size = $facts['os_service_default'],
$max_backups = $facts['os_service_default'], $max_backups = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
virtlockd_config { virtlockd_config {

View File

@@ -45,7 +45,6 @@ class nova::compute::libvirt::virtlogd (
$max_size = $facts['os_service_default'], $max_size = $facts['os_service_default'],
$max_backups = $facts['os_service_default'], $max_backups = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
virtlogd_config { virtlogd_config {

View File

@@ -51,7 +51,6 @@ class nova::compute::libvirt::virtnodedevd (
$admin_max_client_requests = $facts['os_service_default'], $admin_max_client_requests = $facts['os_service_default'],
$ovs_timeout = $facts['os_service_default'], $ovs_timeout = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
virtnodedevd_config { virtnodedevd_config {

View File

@@ -59,7 +59,6 @@ class nova::compute::libvirt::virtproxyd (
$ovs_timeout = $facts['os_service_default'], $ovs_timeout = $facts['os_service_default'],
$tls_priority = $facts['os_service_default'], $tls_priority = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
virtproxyd_config { virtproxyd_config {

View File

@@ -52,7 +52,6 @@ class nova::compute::libvirt::virtqemud (
$admin_max_client_requests = $facts['os_service_default'], $admin_max_client_requests = $facts['os_service_default'],
$ovs_timeout = $facts['os_service_default'], $ovs_timeout = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
virtqemud_config { virtqemud_config {

View File

@@ -51,7 +51,6 @@ class nova::compute::libvirt::virtsecretd (
$admin_max_client_requests = $facts['os_service_default'], $admin_max_client_requests = $facts['os_service_default'],
$ovs_timeout = $facts['os_service_default'], $ovs_timeout = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
virtsecretd_config { virtsecretd_config {

View File

@@ -28,7 +28,6 @@ class nova::compute::libvirt::virtstoraged (
$log_outputs = $facts['os_service_default'], $log_outputs = $facts['os_service_default'],
$ovs_timeout = $facts['os_service_default'], $ovs_timeout = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
virtstoraged_config { virtstoraged_config {
@@ -38,4 +37,3 @@ class nova::compute::libvirt::virtstoraged (
'ovs_timeout': value => $ovs_timeout; 'ovs_timeout': value => $ovs_timeout;
} }
} }

View File

@@ -28,7 +28,6 @@ define nova::compute::mdev_type (
$mdev_class = $facts['os_service_default'], $mdev_class = $facts['os_service_default'],
$max_instances = $facts['os_service_default'], $max_instances = $facts['os_service_default'],
) { ) {
nova_config { nova_config {
"mdev_${mdev_type}/device_addresses": value => join(any2array($device_addresses), ','); "mdev_${mdev_type}/device_addresses": value => join(any2array($device_addresses), ',');
"mdev_${mdev_type}/mdev_class": value => $mdev_class; "mdev_${mdev_type}/mdev_class": value => $mdev_class;

View File

@@ -72,7 +72,6 @@ class nova::compute::provider (
Stdlib::Absolutepath $config_location = '/etc/nova/provider_config', Stdlib::Absolutepath $config_location = '/etc/nova/provider_config',
String[1] $config_file = 'provider.yaml', String[1] $config_file = 'provider.yaml',
) { ) {
include nova::deps include nova::deps
include nova::params include nova::params

View File

@@ -116,7 +116,6 @@ class nova::compute::rbd (
$package_ensure = 'present', $package_ensure = 'present',
Boolean $manage_libvirt_secret = true, Boolean $manage_libvirt_secret = true,
) { ) {
include nova::deps include nova::deps
include nova::params include nova::params
@@ -198,5 +197,4 @@ class nova::compute::rbd (
'libvirt/rbd_destroy_volume_retries': ensure => absent; 'libvirt/rbd_destroy_volume_retries': ensure => absent;
} }
} }
} }

View File

@@ -22,7 +22,6 @@ class nova::compute::serial(
$base_url = $facts['os_service_default'], $base_url = $facts['os_service_default'],
$proxyclient_address = $facts['os_service_default'], $proxyclient_address = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
nova_config { nova_config {

View File

@@ -48,7 +48,6 @@ class nova::compute::spice(
Stdlib::Port $proxy_port = 6082, Stdlib::Port $proxy_port = 6082,
String $proxy_path = '/spice_auto.html', String $proxy_path = '/spice_auto.html',
) { ) {
include nova::deps include nova::deps
if $proxy_host { if $proxy_host {

View File

@@ -34,7 +34,6 @@ class nova::conductor(
$workers = $facts['os_workers'], $workers = $facts['os_workers'],
$enable_new_services = $facts['os_service_default'], $enable_new_services = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
include nova::db include nova::db
include nova::params include nova::params

View File

@@ -38,7 +38,6 @@ class nova::config (
Hash $nova_api_paste_ini = {}, Hash $nova_api_paste_ini = {},
Hash $nova_rootwrap_config = {}, Hash $nova_rootwrap_config = {},
) { ) {
include nova::deps include nova::deps
create_resources('nova_config', $nova_config) create_resources('nova_config', $nova_config)

View File

@@ -16,7 +16,6 @@ class nova::consoleauth (
$token_ttl = $facts['os_service_default'], $token_ttl = $facts['os_service_default'],
$enforce_session_timeout = $facts['os_service_default'], $enforce_session_timeout = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
nova_config { nova_config {

View File

@@ -44,7 +44,6 @@ class nova::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 nova::deps include nova::deps
oslo::cors { 'nova_config': oslo::cors { 'nova_config':

View File

@@ -111,7 +111,6 @@ class nova::cron::archive_deleted_rows (
Integer[0] $maxdelay = 0, Integer[0] $maxdelay = 0,
Enum['present', 'absent'] $ensure = 'present', Enum['present', 'absent'] $ensure = 'present',
) inherits nova::params { ) inherits nova::params {
include nova::deps include nova::deps
if $until_complete { if $until_complete {

View File

@@ -79,7 +79,6 @@ class nova::cron::purge_shadow_tables (
Integer[0] $maxdelay = 0, Integer[0] $maxdelay = 0,
Enum['present', 'absent'] $ensure = 'present', Enum['present', 'absent'] $ensure = 'present',
) inherits nova::params { ) inherits nova::params {
include nova::deps include nova::deps
include nova::params include nova::params

View File

@@ -117,7 +117,6 @@ class nova::db (
$api_database_max_overflow = $facts['os_service_default'], $api_database_max_overflow = $facts['os_service_default'],
$api_database_pool_timeout = $facts['os_service_default'], $api_database_pool_timeout = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
oslo::db { 'nova_config': oslo::db { 'nova_config':

View File

@@ -40,7 +40,6 @@ class nova::db::mysql_api(
$collate = 'utf8_general_ci', $collate = 'utf8_general_ci',
$allowed_hosts = undef, $allowed_hosts = undef,
) { ) {
include nova::deps include nova::deps
openstacklib::db::mysql { 'nova_api': openstacklib::db::mysql { 'nova_api':

View File

@@ -17,7 +17,6 @@ class nova::db::online_data_migrations(
$extra_params = undef, $extra_params = undef,
$db_sync_timeout = 300, $db_sync_timeout = 300,
) { ) {
include nova::deps include nova::deps
include nova::params include nova::params

View File

@@ -37,7 +37,6 @@ class nova::db::postgresql(
$privileges = 'ALL', $privileges = 'ALL',
Boolean $setup_cell0 = true, Boolean $setup_cell0 = true,
) { ) {
include nova::deps include nova::deps
openstacklib::db::postgresql { 'nova': openstacklib::db::postgresql { 'nova':

View File

@@ -31,7 +31,6 @@ class nova::db::postgresql_api(
$encoding = undef, $encoding = undef,
$privileges = 'ALL', $privileges = 'ALL',
) { ) {
include nova::deps include nova::deps
openstacklib::db::postgresql { 'nova_api': openstacklib::db::postgresql { 'nova_api':

View File

@@ -17,7 +17,6 @@ class nova::db::sync(
$extra_params = undef, $extra_params = undef,
$db_sync_timeout = 300, $db_sync_timeout = 300,
) { ) {
include nova::deps include nova::deps
include nova::params include nova::params

View File

@@ -26,7 +26,6 @@ class nova::db::sync_api(
Boolean $cellv2_setup = false, Boolean $cellv2_setup = false,
$db_sync_timeout = 300, $db_sync_timeout = 300,
) { ) {
include nova::deps include nova::deps
include nova::params include nova::params

View File

@@ -37,7 +37,6 @@ define nova::generic_service(
Boolean $manage_service = true, Boolean $manage_service = true,
$ensure_package = 'present' $ensure_package = 'present'
) { ) {
include nova::deps include nova::deps
include nova::params include nova::params

View File

@@ -54,7 +54,6 @@ class nova::glance (
$rbd_pool = $facts['os_service_default'], $rbd_pool = $facts['os_service_default'],
$rbd_ceph_conf = $facts['os_service_default'], $rbd_ceph_conf = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
nova_config { nova_config {

View File

@@ -439,7 +439,6 @@ class nova(
$cert_file = undef, $cert_file = undef,
$key_file = undef, $key_file = undef,
) inherits nova::params { ) inherits nova::params {
include nova::deps include nova::deps
include nova::workarounds include nova::workarounds
@@ -451,7 +450,6 @@ class nova(
} }
} }
if $nova_public_key or $nova_private_key { if $nova_public_key or $nova_private_key {
file { '/var/lib/nova/.ssh': file { '/var/lib/nova/.ssh':
ensure => directory, ensure => directory,

View File

@@ -87,7 +87,6 @@ class nova::ironic::common (
$conductor_group = $facts['os_service_default'], $conductor_group = $facts['os_service_default'],
$shard = $facts['os_service_default'], $shard = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
if is_service_default($system_scope) { if is_service_default($system_scope) {
@@ -117,5 +116,4 @@ class nova::ironic::common (
'ironic/conductor_group': value => $conductor_group; 'ironic/conductor_group': value => $conductor_group;
'ironic/shard': value => $shard; 'ironic/shard': value => $shard;
} }
} }

View File

@@ -11,7 +11,6 @@
class nova::key_manager ( class nova::key_manager (
$backend = 'nova.keymgr.conf_key_mgr.ConfKeyManager', $backend = 'nova.keymgr.conf_key_mgr.ConfKeyManager',
) { ) {
include nova::deps include nova::deps
oslo::key_manager { 'nova_config': oslo::key_manager { 'nova_config':

View File

@@ -47,7 +47,6 @@ class nova::key_manager::barbican (
$barbican_region_name = $facts['os_service_default'], $barbican_region_name = $facts['os_service_default'],
$send_service_user_token = $facts['os_service_default'], $send_service_user_token = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
# cryptsetup is required when Barbican is encrypting volumes # cryptsetup is required when Barbican is encrypting volumes

View File

@@ -78,7 +78,6 @@ class nova::key_manager::barbican::service_user(
$keyfile = $facts['os_service_default'], $keyfile = $facts['os_service_default'],
$region_name = $facts['os_service_default'], $region_name = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
oslo::key_manager::barbican::service_user { 'nova_config': oslo::key_manager::barbican::service_user { 'nova_config':

View File

@@ -80,7 +80,6 @@ class nova::keystone (
$username = 'nova', $username = 'nova',
$user_domain_name = 'Default', $user_domain_name = 'Default',
) { ) {
include nova::deps include nova::deps
if is_service_default($system_scope) { if is_service_default($system_scope) {

View File

@@ -95,7 +95,6 @@ class nova::keystone::auth(
Boolean $configure_user_role = true, Boolean $configure_user_role = true,
Boolean $configure_service = true, Boolean $configure_service = true,
) { ) {
include nova::deps include nova::deps
Keystone::Resource::Service_identity['nova'] -> Anchor['nova::service::end'] Keystone::Resource::Service_identity['nova'] -> Anchor['nova::service::end']
@@ -120,5 +119,4 @@ class nova::keystone::auth(
admin_url => $admin_url, admin_url => $admin_url,
internal_url => $internal_url, internal_url => $internal_url,
} }
} }

View File

@@ -234,7 +234,6 @@ class nova::keystone::authtoken(
$interface = $facts['os_service_default'], $interface = $facts['os_service_default'],
$params = {}, $params = {},
) { ) {
include nova::deps include nova::deps
keystone::resource::authtoken { keystone::resource::authtoken {

View File

@@ -84,7 +84,6 @@ class nova::keystone::service_user(
$keyfile = $facts['os_service_default'], $keyfile = $facts['os_service_default'],
$region_name = $facts['os_service_default'], $region_name = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
keystone::resource::service_user { 'nova_config': keystone::resource::service_user { 'nova_config':

View File

@@ -91,7 +91,6 @@ class nova::limit(
$region_name = $facts['os_service_default'], $region_name = $facts['os_service_default'],
$endpoint_override = $facts['os_service_default'], $endpoint_override = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
if $endpoint_id != undef { if $endpoint_id != undef {

View File

@@ -118,7 +118,6 @@ class nova::logging(
$instance_uuid_format = $facts['os_service_default'], $instance_uuid_format = $facts['os_service_default'],
$log_date_format = $facts['os_service_default'], $log_date_format = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
include nova::params include nova::params
@@ -143,5 +142,4 @@ class nova::logging(
instance_uuid_format => $instance_uuid_format, instance_uuid_format => $instance_uuid_format,
log_date_format => $log_date_format, log_date_format => $log_date_format,
} }
} }

View File

@@ -34,7 +34,6 @@ class nova::metadata(
$local_metadata_per_cell = $facts['os_service_default'], $local_metadata_per_cell = $facts['os_service_default'],
$dhcp_domain = $facts['os_service_default'], $dhcp_domain = $facts['os_service_default'],
) inherits nova::params { ) inherits nova::params {
include nova::deps include nova::deps
nova_config { nova_config {

View File

@@ -202,7 +202,6 @@ class nova::migration::libvirt(
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$live_migration_tunnelled = undef, $live_migration_tunnelled = undef,
) inherits nova::params { ) inherits nova::params {
include nova::deps include nova::deps
if $live_migration_tunnelled != undef { if $live_migration_tunnelled != undef {
@@ -388,7 +387,6 @@ class nova::migration::libvirt(
path => ['/sbin', '/usr/sbin', '/bin', '/usr/bin'], path => ['/sbin', '/usr/sbin', '/bin', '/usr/bin'],
refreshonly => true, refreshonly => true,
} ~> Service[$socket_name] } ~> Service[$socket_name]
} else { } else {
$listen_address_real = normalize_ip_for_uri($listen_address) $listen_address_real = normalize_ip_for_uri($listen_address)

View File

@@ -32,7 +32,6 @@ class nova::migration::qemu(
$migration_port_min = $facts['os_service_default'], $migration_port_min = $facts['os_service_default'],
$migration_port_max = $facts['os_service_default'], $migration_port_max = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
Qemu_config<||> ~> Service<| tag == 'libvirt-qemu-service' |> Qemu_config<||> ~> Service<| tag == 'libvirt-qemu-service' |>

View File

@@ -113,7 +113,6 @@ class nova::network::neutron (
$vif_plugging_timeout = $facts['os_service_default'], $vif_plugging_timeout = $facts['os_service_default'],
$default_floating_pool = $facts['os_service_default'], $default_floating_pool = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
if is_service_default($system_scope) { if is_service_default($system_scope) {

View File

@@ -22,7 +22,6 @@ class nova::os_brick(
$wait_mpath_device_attempts = $facts['os_service_default'], $wait_mpath_device_attempts = $facts['os_service_default'],
$wait_mpath_device_interval = $facts['os_service_default'], $wait_mpath_device_interval = $facts['os_service_default'],
) { ) {
oslo::os_brick { 'nova_config': oslo::os_brick { 'nova_config':
lock_path => $lock_path, lock_path => $lock_path,
wait_mpath_device_attempts => $wait_mpath_device_attempts, wait_mpath_device_attempts => $wait_mpath_device_attempts,

View File

@@ -142,5 +142,4 @@ class nova::params {
fail("Unsupported osfamily: ${facts['os']['family']}") fail("Unsupported osfamily: ${facts['os']['family']}")
} }
} }
} }

View File

@@ -64,7 +64,6 @@ class nova::placement(
$user_domain_name = 'Default', $user_domain_name = 'Default',
$username = 'placement', $username = 'placement',
) inherits nova::params { ) inherits nova::params {
include nova::deps include nova::deps
if is_service_default($system_scope) { if is_service_default($system_scope) {
@@ -87,5 +86,4 @@ class nova::placement(
'placement/region_name': value => $region_name; 'placement/region_name': value => $region_name;
'placement/valid_interfaces': value => join(any2array($valid_interfaces), ','); 'placement/valid_interfaces': value => join(any2array($valid_interfaces), ',');
} }
} }

View File

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

View File

@@ -83,7 +83,6 @@ class nova::quota(
$unified_limits_resource_strategy = $facts['os_service_default'], $unified_limits_resource_strategy = $facts['os_service_default'],
$unified_limits_resource_list = $facts['os_service_default'], $unified_limits_resource_list = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
nova_config { nova_config {

View File

@@ -22,7 +22,6 @@ class nova::reports(
$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 nova::deps include nova::deps
oslo::reports { 'nova_config': oslo::reports { 'nova_config':

View File

@@ -80,7 +80,6 @@ class nova::scheduler(
$enable_isolated_aggregate_filtering = $facts['os_service_default'], $enable_isolated_aggregate_filtering = $facts['os_service_default'],
$query_placement_for_routed_network_aggregates = $facts['os_service_default'], $query_placement_for_routed_network_aggregates = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
include nova::db include nova::db
include nova::params include nova::params

View File

@@ -134,7 +134,6 @@ class nova::scheduler::filter (
$aggregate_image_properties_isolation_separator = $facts['os_service_default'], $aggregate_image_properties_isolation_separator = $facts['os_service_default'],
$pci_in_placement = $facts['os_service_default'], $pci_in_placement = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
if empty($available_filters) { if empty($available_filters) {
@@ -194,5 +193,4 @@ class nova::scheduler::filter (
'filter_scheduler/pci_in_placement': 'filter_scheduler/pci_in_placement':
value => $pci_in_placement; value => $pci_in_placement;
} }
} }

View File

@@ -31,7 +31,6 @@ class nova::serialproxy(
$serialproxy_port = $facts['os_service_default'], $serialproxy_port = $facts['os_service_default'],
$ensure_package = 'present' $ensure_package = 'present'
) { ) {
include nova::deps include nova::deps
include nova::params include nova::params
@@ -47,5 +46,4 @@ class nova::serialproxy(
service_name => $nova::params::serialproxy_service_name, service_name => $nova::params::serialproxy_service_name,
ensure_package => $ensure_package, ensure_package => $ensure_package,
} }
} }

View File

@@ -35,7 +35,6 @@ class nova::spicehtml5proxy(
$port = '6082', $port = '6082',
$ensure_package = 'present' $ensure_package = 'present'
) { ) {
include nova::deps include nova::deps
include nova::params include nova::params

View File

@@ -74,7 +74,6 @@ class nova::vncproxy(
$vencrypt_cert = undef, $vencrypt_cert = undef,
$vencrypt_ca = $facts['os_service_default'], $vencrypt_ca = $facts['os_service_default'],
) { ) {
include nova::deps include nova::deps
include nova::params include nova::params
@@ -83,7 +82,6 @@ class nova::vncproxy(
} }
if $allow_vencrypt { if $allow_vencrypt {
if (!$vencrypt_cert or !$vencrypt_key) { if (!$vencrypt_cert or !$vencrypt_key) {
fail('vencrypt_cert and vencrypt_key are required when allow_vencrypt is true') fail('vencrypt_cert and vencrypt_key are required when allow_vencrypt is true')
} }
@@ -144,5 +142,4 @@ class nova::vncproxy(
service_name => $nova::params::vncproxy_service_name, service_name => $nova::params::vncproxy_service_name,
ensure_package => $ensure_package, ensure_package => $ensure_package,
} }
} }

View File

@@ -22,7 +22,6 @@ class nova::vncproxy::common (
Optional[Stdlib::Port] $vncproxy_port = undef, Optional[Stdlib::Port] $vncproxy_port = undef,
Optional[String] $vncproxy_path = undef, Optional[String] $vncproxy_path = undef,
) { ) {
include nova::deps include nova::deps
if defined('$nova::compute::vncproxy_host') { if defined('$nova::compute::vncproxy_host') {

View File

@@ -80,6 +80,7 @@ class nova::workarounds (
# DEPRECATED PARAMETER # DEPRECATED PARAMETER
$enable_numa_live_migration = undef, $enable_numa_live_migration = undef,
) { ) {
include nova::deps
if $enable_numa_live_migration != undef { if $enable_numa_live_migration != undef {
warning('The enable_numa_live_migration parameter is deprecated') warning('The enable_numa_live_migration parameter is deprecated')
@@ -110,5 +111,4 @@ class nova::workarounds (
'workarounds/skip_cpu_compare_at_startup': 'workarounds/skip_cpu_compare_at_startup':
value => $skip_cpu_compare_at_startup; value => $skip_cpu_compare_at_startup;
} }
} }

View File

@@ -166,7 +166,6 @@ class nova::wsgi::apache_api (
$request_headers = undef, $request_headers = undef,
$vhost_custom_fragment = undef, $vhost_custom_fragment = undef,
) { ) {
include nova::params include nova::params
if ! defined(Class[nova::api]) { if ! defined(Class[nova::api]) {

View File

@@ -171,7 +171,6 @@ class nova::wsgi::apache_metadata (
$request_headers = undef, $request_headers = undef,
$vhost_custom_fragment = undef, $vhost_custom_fragment = undef,
) { ) {
include nova::params include nova::params
nova::generic_service { 'metadata-api': nova::generic_service { 'metadata-api':

View File

@@ -26,7 +26,6 @@ class nova::wsgi::uwsgi_api (
$threads = 1, $threads = 1,
$listen_queue_size = 100, $listen_queue_size = 100,
) { ) {
include nova::deps include nova::deps
if $facts['os']['name'] != 'Debian' { if $facts['os']['name'] != 'Debian' {

View File

@@ -26,7 +26,6 @@ class nova::wsgi::uwsgi_api_metadata (
$threads = 1, $threads = 1,
$listen_queue_size = 100, $listen_queue_size = 100,
) { ) {
include nova::deps include nova::deps
if $facts['os']['name'] != 'Debian' { if $facts['os']['name'] != 'Debian' {