diff --git a/examples/nova_with_pacemaker.pp b/examples/nova_with_pacemaker.pp index f6a7e3054..9726d0900 100644 --- a/examples/nova_with_pacemaker.pp +++ b/examples/nova_with_pacemaker.pp @@ -46,4 +46,3 @@ class { 'nova::vncproxy': enabled => false, manage_service => false, } - diff --git a/manifests/api.pp b/manifests/api.pp index 653c4715a..0df315cd0 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -135,7 +135,7 @@ # (optional) Number of workers for metadata service # Defaults to undef # -class nova::api( +class nova::api ( Boolean $enabled = true, Boolean $manage_service = true, $api_paste_config = 'api-paste.ini', @@ -166,7 +166,6 @@ class nova::api( $osapi_compute_workers = undef, $metadata_workers = undef, ) inherits nova::params { - include nova::deps include nova::db include nova::policy @@ -247,7 +246,7 @@ as a standalone service, or httpd for being run by a httpd server") 'DEFAULT/metadata_listen_port': ensure => absent; } - oslo::middleware {'nova_config': + oslo::middleware { 'nova_config': enable_proxy_headers_parsing => $enable_proxy_headers_parsing, max_request_body_size => $max_request_body_size, } diff --git a/manifests/availability_zone.pp b/manifests/availability_zone.pp index 705645c90..fc1cd526a 100644 --- a/manifests/availability_zone.pp +++ b/manifests/availability_zone.pp @@ -21,11 +21,11 @@ class nova::availability_zone ( $default_schedule_zone = $facts['os_service_default'], $internal_service_availability_zone = $facts['os_service_default'], ) { + include nova::deps nova_config { 'DEFAULT/default_availability_zone': value => $default_availability_zone; 'DEFAULT/default_schedule_zone': value => $default_schedule_zone; 'DEFAULT/internal_service_availability_zone': value => $internal_service_availability_zone; } - } diff --git a/manifests/cache.pp b/manifests/cache.pp index c2e3e2337..e03f35477 100644 --- a/manifests/cache.pp +++ b/manifests/cache.pp @@ -259,7 +259,6 @@ class nova::cache ( $dead_timeout = $facts['os_service_default'], Boolean $manage_backend_package = true, ) { - include nova::deps oslo::cache { 'nova_config': diff --git a/manifests/cell_v2/discover_hosts.pp b/manifests/cell_v2/discover_hosts.pp index b6bc9fe22..e7ac0d871 100644 --- a/manifests/cell_v2/discover_hosts.pp +++ b/manifests/cell_v2/discover_hosts.pp @@ -11,7 +11,6 @@ class nova::cell_v2::discover_hosts ( $extra_params = '', ) { - include nova::deps include nova::params diff --git a/manifests/cell_v2/map_cell0.pp b/manifests/cell_v2/map_cell0.pp index e7ec34ff1..cb60c6901 100644 --- a/manifests/cell_v2/map_cell0.pp +++ b/manifests/cell_v2/map_cell0.pp @@ -14,7 +14,6 @@ class nova::cell_v2::map_cell0 ( $extra_params = '', ) { - include nova::deps include nova::params diff --git a/manifests/cell_v2/map_cell_and_hosts.pp b/manifests/cell_v2/map_cell_and_hosts.pp index 8a6916bff..29ce98844 100644 --- a/manifests/cell_v2/map_cell_and_hosts.pp +++ b/manifests/cell_v2/map_cell_and_hosts.pp @@ -11,7 +11,6 @@ class nova::cell_v2::map_cell_and_hosts ( $extra_params = '', ) { - include nova::deps include nova::params diff --git a/manifests/cell_v2/map_instances.pp b/manifests/cell_v2/map_instances.pp index d3de8500a..dac8db0f1 100644 --- a/manifests/cell_v2/map_instances.pp +++ b/manifests/cell_v2/map_instances.pp @@ -24,7 +24,6 @@ class nova::cell_v2::map_instances ( $cell_name = undef, $extra_params = '', ) { - include nova::deps include nova::params diff --git a/manifests/cell_v2/simple_setup.pp b/manifests/cell_v2/simple_setup.pp index 142056437..b45432d61 100644 --- a/manifests/cell_v2/simple_setup.pp +++ b/manifests/cell_v2/simple_setup.pp @@ -33,9 +33,7 @@ class nova::cell_v2::simple_setup ( $database_connection = 'default', $database_connection_cell0 = 'default', ) { - include nova::deps - include nova::cell_v2::map_cell0 nova_cell_v2 { 'cell0': @@ -52,5 +50,4 @@ class nova::cell_v2::simple_setup ( Class['nova::cell_v2::map_cell0'] -> Nova_cell_v2 <| |> ~> Class['nova::cell_v2::discover_hosts'] - } diff --git a/manifests/cinder.pp b/manifests/cinder.pp index 229382a84..273103f35 100644 --- a/manifests/cinder.pp +++ b/manifests/cinder.pp @@ -91,7 +91,6 @@ class nova::cinder ( $cross_az_attach = $facts['os_service_default'], $debug = $facts['os_service_default'], ) { - include nova::deps if is_service_default($password) { diff --git a/manifests/client.pp b/manifests/client.pp index 096cecfbd..1d76a71d3 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -8,7 +8,7 @@ # (optional) The state for the nova client package # Defaults to 'present' # -class nova::client( +class nova::client ( $ensure = 'present' ) { include nova::deps @@ -22,5 +22,4 @@ in a future release.") name => $nova::params::client_package, tag => 'openstack', } - } diff --git a/manifests/compute.pp b/manifests/compute.pp index d4915575a..bd29b19e9 100644 --- a/manifests/compute.pp +++ b/manifests/compute.pp @@ -316,7 +316,6 @@ class nova::compute ( # DEPRECATED PARAMETERS $config_drive_format = undef, ) { - include nova::deps include nova::params diff --git a/manifests/compute/image_cache.pp b/manifests/compute/image_cache.pp index cc8a33619..ad502d767 100644 --- a/manifests/compute/image_cache.pp +++ b/manifests/compute/image_cache.pp @@ -37,7 +37,6 @@ class nova::compute::image_cache ( $remove_unused_resized_minimum_age_seconds = $facts['os_service_default'], $precache_concurrency = $facts['os_service_default'] ) { - include nova::deps nova_config { diff --git a/manifests/compute/ironic.pp b/manifests/compute/ironic.pp index 4759e43d4..71d4533ef 100644 --- a/manifests/compute/ironic.pp +++ b/manifests/compute/ironic.pp @@ -16,7 +16,6 @@ class nova::compute::ironic ( $ensure_package = 'present', $compute_driver = 'ironic.IronicDriver', ) { - include nova::deps require nova::ironic::common diff --git a/manifests/compute/libvirt.pp b/manifests/compute/libvirt.pp index 82fc8b3e7..35014db91 100644 --- a/manifests/compute/libvirt.pp +++ b/manifests/compute/libvirt.pp @@ -291,7 +291,6 @@ class nova::compute::libvirt ( $wait_soft_reboot_seconds = $facts['os_service_default'], $tb_cache_size = $facts['os_service_default'], ) inherits nova::params { - include nova::deps include nova::params diff --git a/manifests/compute/libvirt/config.pp b/manifests/compute/libvirt/config.pp index fad410d80..10313ea7b 100644 --- a/manifests/compute/libvirt/config.pp +++ b/manifests/compute/libvirt/config.pp @@ -63,7 +63,6 @@ class nova::compute::libvirt::config ( Hash $virtstoraged_config = {}, Hash $qemu_config = {}, ) { - include nova::deps create_resources('libvirtd_config', $libvirtd_config) diff --git a/manifests/compute/libvirt/libvirtd.pp b/manifests/compute/libvirt/libvirtd.pp index e5d689e66..ae9e4f98b 100644 --- a/manifests/compute/libvirt/libvirtd.pp +++ b/manifests/compute/libvirt/libvirtd.pp @@ -59,7 +59,6 @@ class nova::compute::libvirt::libvirtd ( $tls_priority = $facts['os_service_default'], $ovs_timeout = $facts['os_service_default'], ) { - include nova::deps libvirtd_config { diff --git a/manifests/compute/libvirt/networks.pp b/manifests/compute/libvirt/networks.pp index eb5ed364f..1cb1737f7 100644 --- a/manifests/compute/libvirt/networks.pp +++ b/manifests/compute/libvirt/networks.pp @@ -8,10 +8,9 @@ # (optional) Whether or not delete the default network. # Defaults to true. # -class nova::compute::libvirt::networks( +class nova::compute::libvirt::networks ( Boolean $disable_default_network = true, ) { - include nova::deps if $disable_default_network { diff --git a/manifests/compute/libvirt/qemu.pp b/manifests/compute/libvirt/qemu.pp index 1cb1266fe..51d1cca8b 100644 --- a/manifests/compute/libvirt/qemu.pp +++ b/manifests/compute/libvirt/qemu.pp @@ -50,7 +50,7 @@ # of the used OS installed via $nova::compute::libvirt::version::default . # Defaults to $nova::compute::libvirt::version::default # -class nova::compute::libvirt::qemu( +class nova::compute::libvirt::qemu ( Boolean $configure_qemu = false, $user = undef, $group = undef, @@ -63,7 +63,6 @@ class nova::compute::libvirt::qemu( Boolean $nbd_tls = false, $libvirt_version = $nova::compute::libvirt::version::default, ) inherits nova::compute::libvirt::version { - include nova::deps if versioncmp($libvirt_version, '4.5') < 0 { @@ -73,7 +72,6 @@ class nova::compute::libvirt::qemu( Qemu_config<||> ~> Service<| tag == 'libvirt-qemu-service' |> if $configure_qemu { - if $vnc_tls { $vnc_tls_verify_real = $vnc_tls_verify } else { @@ -89,25 +87,24 @@ class nova::compute::libvirt::qemu( } if $user and !empty($user) { - qemu_config { 'user': value => $user, quote =>true } + qemu_config { 'user': value => $user, quote => true } } else { qemu_config { 'user': ensure => absent } } if $group and !empty($group) { - qemu_config { 'group': value => $group, quote =>true } + qemu_config { 'group': value => $group, quote => true } } else { qemu_config { 'group': ensure => absent } } if $memory_backing_dir and !empty($memory_backing_dir) { - qemu_config { 'memory_backing_dir': value => $memory_backing_dir, quote =>true } + qemu_config { 'memory_backing_dir': value => $memory_backing_dir, quote => true } } else { qemu_config { 'memory_backing_dir': ensure => absent } } qemu_config { 'nbd_tls': value => $nbd_tls } - } else { qemu_config { 'max_files': ensure => absent; diff --git a/manifests/compute/libvirt/secret_ceph.pp b/manifests/compute/libvirt/secret_ceph.pp index 78df7d89c..a144d3fe8 100644 --- a/manifests/compute/libvirt/secret_ceph.pp +++ b/manifests/compute/libvirt/secret_ceph.pp @@ -30,13 +30,12 @@ # (Optional) Directory to store files related to secrets. # Defaults to /etc/nova # -define nova::compute::libvirt::secret_ceph( +define nova::compute::libvirt::secret_ceph ( Pattern[/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[0-9a-f]{4}-[0-9a-f]{12}$/] $uuid, Stdlib::Base64 $value, String[1] $secret_name = $name, Stdlib::Absolutepath $secret_path = '/etc/nova', ) { - $xml_file = "${secret_path}/libvirt-secret-${uuid}.xml" file { $xml_file: ensure => file, diff --git a/manifests/compute/libvirt/services.pp b/manifests/compute/libvirt/services.pp index 6713c46d5..e37932ec7 100644 --- a/manifests/compute/libvirt/services.pp +++ b/manifests/compute/libvirt/services.pp @@ -72,7 +72,6 @@ class nova::compute::libvirt::services ( Boolean $manage_ovmf = true, Boolean $manage_swtpm = false, ) inherits nova::params { - include nova::deps include nova::params diff --git a/manifests/compute/libvirt/virtlockd.pp b/manifests/compute/libvirt/virtlockd.pp index 23c726121..7b2b420a4 100644 --- a/manifests/compute/libvirt/virtlockd.pp +++ b/manifests/compute/libvirt/virtlockd.pp @@ -45,7 +45,6 @@ class nova::compute::libvirt::virtlockd ( $max_size = $facts['os_service_default'], $max_backups = $facts['os_service_default'], ) { - include nova::deps virtlockd_config { diff --git a/manifests/compute/libvirt/virtlogd.pp b/manifests/compute/libvirt/virtlogd.pp index 9c7ed6d88..26f72e66b 100644 --- a/manifests/compute/libvirt/virtlogd.pp +++ b/manifests/compute/libvirt/virtlogd.pp @@ -45,7 +45,6 @@ class nova::compute::libvirt::virtlogd ( $max_size = $facts['os_service_default'], $max_backups = $facts['os_service_default'], ) { - include nova::deps virtlogd_config { diff --git a/manifests/compute/libvirt/virtnodedevd.pp b/manifests/compute/libvirt/virtnodedevd.pp index e6a5d246a..82524350e 100644 --- a/manifests/compute/libvirt/virtnodedevd.pp +++ b/manifests/compute/libvirt/virtnodedevd.pp @@ -51,7 +51,6 @@ class nova::compute::libvirt::virtnodedevd ( $admin_max_client_requests = $facts['os_service_default'], $ovs_timeout = $facts['os_service_default'], ) { - include nova::deps virtnodedevd_config { diff --git a/manifests/compute/libvirt/virtproxyd.pp b/manifests/compute/libvirt/virtproxyd.pp index bd12d4a4c..d36950520 100644 --- a/manifests/compute/libvirt/virtproxyd.pp +++ b/manifests/compute/libvirt/virtproxyd.pp @@ -59,7 +59,6 @@ class nova::compute::libvirt::virtproxyd ( $ovs_timeout = $facts['os_service_default'], $tls_priority = $facts['os_service_default'], ) { - include nova::deps virtproxyd_config { diff --git a/manifests/compute/libvirt/virtqemud.pp b/manifests/compute/libvirt/virtqemud.pp index 134729c02..9f3f0f02b 100644 --- a/manifests/compute/libvirt/virtqemud.pp +++ b/manifests/compute/libvirt/virtqemud.pp @@ -52,7 +52,6 @@ class nova::compute::libvirt::virtqemud ( $admin_max_client_requests = $facts['os_service_default'], $ovs_timeout = $facts['os_service_default'], ) { - include nova::deps virtqemud_config { diff --git a/manifests/compute/libvirt/virtsecretd.pp b/manifests/compute/libvirt/virtsecretd.pp index f01655ad8..40abf6096 100644 --- a/manifests/compute/libvirt/virtsecretd.pp +++ b/manifests/compute/libvirt/virtsecretd.pp @@ -51,7 +51,6 @@ class nova::compute::libvirt::virtsecretd ( $admin_max_client_requests = $facts['os_service_default'], $ovs_timeout = $facts['os_service_default'], ) { - include nova::deps virtsecretd_config { diff --git a/manifests/compute/libvirt/virtstoraged.pp b/manifests/compute/libvirt/virtstoraged.pp index 68895eef1..1ef169385 100644 --- a/manifests/compute/libvirt/virtstoraged.pp +++ b/manifests/compute/libvirt/virtstoraged.pp @@ -28,14 +28,12 @@ class nova::compute::libvirt::virtstoraged ( $log_outputs = $facts['os_service_default'], $ovs_timeout = $facts['os_service_default'], ) { - include nova::deps virtstoraged_config { - 'log_level': value => $log_level; - 'log_filters': value => join(any2array($log_filters), ' '), quote => true; - 'log_outputs': value => join(any2array($log_outputs), ' '), quote => true; - 'ovs_timeout': value => $ovs_timeout; + 'log_level': value => $log_level; + 'log_filters': value => join(any2array($log_filters), ' '), quote => true; + 'log_outputs': value => join(any2array($log_outputs), ' '), quote => true; + 'ovs_timeout': value => $ovs_timeout; } } - diff --git a/manifests/compute/mdev.pp b/manifests/compute/mdev.pp index 0f5fd725c..eaab24de2 100644 --- a/manifests/compute/mdev.pp +++ b/manifests/compute/mdev.pp @@ -8,7 +8,7 @@ # (Optional) A hash to define the nova::compute::mdev_type resources. # Defaults to {} # -class nova::compute::mdev( +class nova::compute::mdev ( Hash $mdev_types = {}, ) { include nova::deps diff --git a/manifests/compute/mdev_type.pp b/manifests/compute/mdev_type.pp index 7ebb2d476..9e5f6ed08 100644 --- a/manifests/compute/mdev_type.pp +++ b/manifests/compute/mdev_type.pp @@ -28,7 +28,6 @@ define nova::compute::mdev_type ( $mdev_class = $facts['os_service_default'], $max_instances = $facts['os_service_default'], ) { - nova_config { "mdev_${mdev_type}/device_addresses": value => join(any2array($device_addresses), ','); "mdev_${mdev_type}/mdev_class": value => $mdev_class; diff --git a/manifests/compute/pci.pp b/manifests/compute/pci.pp index 5ecdc1bcb..eb7f62857 100644 --- a/manifests/compute/pci.pp +++ b/manifests/compute/pci.pp @@ -21,7 +21,7 @@ # (optional) Pci passthrough list of hash. # Defaults to undef # -class nova::compute::pci( +class nova::compute::pci ( Array[Hash] $device_specs = [], $report_in_placement = $facts['os_service_default'], # DEPRECATED PARAMETERS diff --git a/manifests/compute/provider.pp b/manifests/compute/provider.pp index 000c9dcf1..eb4d09f44 100644 --- a/manifests/compute/provider.pp +++ b/manifests/compute/provider.pp @@ -72,7 +72,6 @@ class nova::compute::provider ( Stdlib::Absolutepath $config_location = '/etc/nova/provider_config', String[1] $config_file = 'provider.yaml', ) { - include nova::deps include nova::params diff --git a/manifests/compute/rbd.pp b/manifests/compute/rbd.pp index 04ba5a004..84b8001fb 100644 --- a/manifests/compute/rbd.pp +++ b/manifests/compute/rbd.pp @@ -116,7 +116,6 @@ class nova::compute::rbd ( $package_ensure = 'present', Boolean $manage_libvirt_secret = true, ) { - include nova::deps include nova::params @@ -198,5 +197,4 @@ class nova::compute::rbd ( 'libvirt/rbd_destroy_volume_retries': ensure => absent; } } - } diff --git a/manifests/compute/serial.pp b/manifests/compute/serial.pp index 08f17e778..e2c6065ab 100644 --- a/manifests/compute/serial.pp +++ b/manifests/compute/serial.pp @@ -17,12 +17,11 @@ # should connect (string value) # Defaults to $facts['os_service_default'] # -class nova::compute::serial( +class nova::compute::serial ( $port_range = $facts['os_service_default'], $base_url = $facts['os_service_default'], $proxyclient_address = $facts['os_service_default'], ) { - include nova::deps nova_config { diff --git a/manifests/compute/spice.pp b/manifests/compute/spice.pp index e42c0e961..bf7b838af 100644 --- a/manifests/compute/spice.pp +++ b/manifests/compute/spice.pp @@ -38,7 +38,7 @@ # (optional) Path of the spice html file for the html5 console proxy # Defaults to '/spice_auto.html' # -class nova::compute::spice( +class nova::compute::spice ( Boolean $agent_enabled = true, $server_listen = $facts['os_service_default'], $server_proxyclient_address = $facts['os_service_default'], @@ -48,7 +48,6 @@ class nova::compute::spice( Stdlib::Port $proxy_port = 6082, String $proxy_path = '/spice_auto.html', ) { - include nova::deps if $proxy_host { diff --git a/manifests/conductor.pp b/manifests/conductor.pp index 82c335453..b6c7779da 100644 --- a/manifests/conductor.pp +++ b/manifests/conductor.pp @@ -27,14 +27,13 @@ # by the conductor service which is responsible for creating the service entries. # Defaults to $facts['os_service_default'] # -class nova::conductor( +class nova::conductor ( Boolean $enabled = true, Boolean $manage_service = true, $ensure_package = 'present', $workers = $facts['os_workers'], $enable_new_services = $facts['os_service_default'], ) { - include nova::deps include nova::db include nova::params diff --git a/manifests/config.pp b/manifests/config.pp index 16100d59a..226e6e7e0 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -38,7 +38,6 @@ class nova::config ( Hash $nova_api_paste_ini = {}, Hash $nova_rootwrap_config = {}, ) { - include nova::deps create_resources('nova_config', $nova_config) diff --git a/manifests/consoleauth.pp b/manifests/consoleauth.pp index db20b39ca..2c7fb5d10 100644 --- a/manifests/consoleauth.pp +++ b/manifests/consoleauth.pp @@ -16,7 +16,6 @@ class nova::consoleauth ( $token_ttl = $facts['os_service_default'], $enforce_session_timeout = $facts['os_service_default'], ) { - include nova::deps nova_config { diff --git a/manifests/cors.pp b/manifests/cors.pp index cdca217e3..929b47934 100644 --- a/manifests/cors.pp +++ b/manifests/cors.pp @@ -44,7 +44,6 @@ class nova::cors ( $allow_methods = $facts['os_service_default'], $allow_headers = $facts['os_service_default'], ) { - include nova::deps oslo::cors { 'nova_config': diff --git a/manifests/cron/archive_deleted_rows.pp b/manifests/cron/archive_deleted_rows.pp index 662793635..01162caf8 100644 --- a/manifests/cron/archive_deleted_rows.pp +++ b/manifests/cron/archive_deleted_rows.pp @@ -111,7 +111,6 @@ class nova::cron::archive_deleted_rows ( Integer[0] $maxdelay = 0, Enum['present', 'absent'] $ensure = 'present', ) inherits nova::params { - include nova::deps if $until_complete { diff --git a/manifests/cron/purge_shadow_tables.pp b/manifests/cron/purge_shadow_tables.pp index f7bb239d5..5c42603d2 100644 --- a/manifests/cron/purge_shadow_tables.pp +++ b/manifests/cron/purge_shadow_tables.pp @@ -79,7 +79,6 @@ class nova::cron::purge_shadow_tables ( Integer[0] $maxdelay = 0, Enum['present', 'absent'] $ensure = 'present', ) inherits nova::params { - include nova::deps include nova::params diff --git a/manifests/db.pp b/manifests/db.pp index 93daec8a3..b3091b420 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -117,7 +117,6 @@ class nova::db ( $api_database_max_overflow = $facts['os_service_default'], $api_database_pool_timeout = $facts['os_service_default'], ) { - include nova::deps oslo::db { 'nova_config': diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index 517cd9c71..6e0829521 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -36,7 +36,7 @@ # be set to true by default in Ocata when the cell v2 setup is mandatory. # Defaults to true # -class nova::db::mysql( +class nova::db::mysql ( String[1] $password, $dbname = 'nova', $user = 'nova', diff --git a/manifests/db/mysql_api.pp b/manifests/db/mysql_api.pp index 88287b454..0f228f4dd 100644 --- a/manifests/db/mysql_api.pp +++ b/manifests/db/mysql_api.pp @@ -31,7 +31,7 @@ # (Optional) Additional hosts that are allowed to access this DB # Defaults to undef # -class nova::db::mysql_api( +class nova::db::mysql_api ( $password, $dbname = 'nova_api', $user = 'nova_api', @@ -40,7 +40,6 @@ class nova::db::mysql_api( $collate = 'utf8_general_ci', $allowed_hosts = undef, ) { - include nova::deps openstacklib::db::mysql { 'nova_api': diff --git a/manifests/db/online_data_migrations.pp b/manifests/db/online_data_migrations.pp index c644d8cb6..7436e6035 100644 --- a/manifests/db/online_data_migrations.pp +++ b/manifests/db/online_data_migrations.pp @@ -13,11 +13,10 @@ # (optional) Timeout for the execution of the db_sync # Defaults to 300. # -class nova::db::online_data_migrations( +class nova::db::online_data_migrations ( $extra_params = undef, $db_sync_timeout = 300, ) { - include nova::deps include nova::params diff --git a/manifests/db/postgresql.pp b/manifests/db/postgresql.pp index 8be46281b..080034db6 100644 --- a/manifests/db/postgresql.pp +++ b/manifests/db/postgresql.pp @@ -29,7 +29,7 @@ # be set to true by default in Ocata when the cell v2 setup is mandatory. # Defaults to true # -class nova::db::postgresql( +class nova::db::postgresql ( String[1] $password, $dbname = 'nova', $user = 'nova', @@ -37,7 +37,6 @@ class nova::db::postgresql( $privileges = 'ALL', Boolean $setup_cell0 = true, ) { - include nova::deps openstacklib::db::postgresql { 'nova': diff --git a/manifests/db/postgresql_api.pp b/manifests/db/postgresql_api.pp index fda311e89..2e71c1d87 100644 --- a/manifests/db/postgresql_api.pp +++ b/manifests/db/postgresql_api.pp @@ -24,14 +24,13 @@ # (Optional) Privileges given to the database user. # Default to 'ALL' # -class nova::db::postgresql_api( +class nova::db::postgresql_api ( $password, $dbname = 'nova_api', $user = 'nova_api', $encoding = undef, $privileges = 'ALL', ) { - include nova::deps openstacklib::db::postgresql { 'nova_api': diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index a68bb901b..4d4a462aa 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -13,11 +13,10 @@ # (Optional) Timeout for the execution of the db_sync # Defaults to 300 # -class nova::db::sync( +class nova::db::sync ( $extra_params = undef, $db_sync_timeout = 300, ) { - include nova::deps include nova::params diff --git a/manifests/db/sync_api.pp b/manifests/db/sync_api.pp index 278d04846..3c3d34fe2 100644 --- a/manifests/db/sync_api.pp +++ b/manifests/db/sync_api.pp @@ -21,12 +21,11 @@ # (Optional) Timeout for the execution of the db_sync # Defaults to 300. # -class nova::db::sync_api( +class nova::db::sync_api ( $extra_params = undef, Boolean $cellv2_setup = false, $db_sync_timeout = 300, ) { - include nova::deps include nova::params diff --git a/manifests/generic_service.pp b/manifests/generic_service.pp index 1b35e8d33..7c67fe35d 100644 --- a/manifests/generic_service.pp +++ b/manifests/generic_service.pp @@ -30,14 +30,13 @@ # (optional) Control the ensure parameter for the package resource. # Defaults to 'present'. # -define nova::generic_service( +define nova::generic_service ( $package_name, $service_name, Boolean $enabled = true, Boolean $manage_service = true, $ensure_package = 'present' ) { - include nova::deps include nova::params diff --git a/manifests/glance.pp b/manifests/glance.pp index 51da934b4..113814e11 100644 --- a/manifests/glance.pp +++ b/manifests/glance.pp @@ -54,7 +54,6 @@ class nova::glance ( $rbd_pool = $facts['os_service_default'], $rbd_ceph_conf = $facts['os_service_default'], ) { - include nova::deps nova_config { diff --git a/manifests/init.pp b/manifests/init.pp index 5db9433e8..5bc58b549 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -363,7 +363,7 @@ # will be run through a green thread. # Defaults to undef # -class nova( +class nova ( $ensure_package = 'present', $default_transport_url = $facts['os_service_default'], $rpc_response_timeout = $facts['os_service_default'], @@ -439,7 +439,6 @@ class nova( $cert_file = undef, $key_file = undef, ) inherits nova::params { - include nova::deps include nova::workarounds @@ -451,7 +450,6 @@ class nova( } } - if $nova_public_key or $nova_private_key { file { '/var/lib/nova/.ssh': ensure => directory, @@ -524,7 +522,7 @@ class nova( 'DEFAULT/cell_worker_thread_pool_size': value => $cell_worker_thread_pool_size; } - oslo::messaging::rabbit {'nova_config': + oslo::messaging::rabbit { 'nova_config': rabbit_use_ssl => $rabbit_use_ssl, heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold, heartbeat_rate => $rabbit_heartbeat_rate, diff --git a/manifests/ironic/common.pp b/manifests/ironic/common.pp index 699b957df..e7e7d217f 100644 --- a/manifests/ironic/common.pp +++ b/manifests/ironic/common.pp @@ -87,7 +87,6 @@ class nova::ironic::common ( $conductor_group = $facts['os_service_default'], $shard = $facts['os_service_default'], ) { - include nova::deps if is_service_default($system_scope) { @@ -117,5 +116,4 @@ class nova::ironic::common ( 'ironic/conductor_group': value => $conductor_group; 'ironic/shard': value => $shard; } - } diff --git a/manifests/key_manager.pp b/manifests/key_manager.pp index d0440816b..ef852a714 100644 --- a/manifests/key_manager.pp +++ b/manifests/key_manager.pp @@ -11,7 +11,6 @@ class nova::key_manager ( $backend = 'nova.keymgr.conf_key_mgr.ConfKeyManager', ) { - include nova::deps oslo::key_manager { 'nova_config': diff --git a/manifests/key_manager/barbican.pp b/manifests/key_manager/barbican.pp index 66dd5eea9..b1655727b 100644 --- a/manifests/key_manager/barbican.pp +++ b/manifests/key_manager/barbican.pp @@ -47,7 +47,6 @@ class nova::key_manager::barbican ( $barbican_region_name = $facts['os_service_default'], $send_service_user_token = $facts['os_service_default'], ) { - include nova::deps # cryptsetup is required when Barbican is encrypting volumes diff --git a/manifests/key_manager/barbican/service_user.pp b/manifests/key_manager/barbican/service_user.pp index 9dcc792b6..03171efca 100644 --- a/manifests/key_manager/barbican/service_user.pp +++ b/manifests/key_manager/barbican/service_user.pp @@ -62,7 +62,7 @@ # (Optional) The region in which the identity server can be found. # Defaults to $facts['os_service_default']. # -class nova::key_manager::barbican::service_user( +class nova::key_manager::barbican::service_user ( $password, $username = 'nova', $auth_url = 'http://localhost:5000', @@ -78,7 +78,6 @@ class nova::key_manager::barbican::service_user( $keyfile = $facts['os_service_default'], $region_name = $facts['os_service_default'], ) { - include nova::deps oslo::key_manager::barbican::service_user { 'nova_config': diff --git a/manifests/keystone.pp b/manifests/keystone.pp index 43e12baf4..3ae7ab37b 100644 --- a/manifests/keystone.pp +++ b/manifests/keystone.pp @@ -80,7 +80,6 @@ class nova::keystone ( $username = 'nova', $user_domain_name = 'Default', ) { - include nova::deps if is_service_default($system_scope) { diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index dbfe42bab..5bb30e002 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -75,7 +75,7 @@ # (Optional) Should the service be configurd? # Defaults to True # -class nova::keystone::auth( +class nova::keystone::auth ( String[1] $password, String[1] $auth_name = 'nova', String[1] $service_name = 'nova', @@ -95,7 +95,6 @@ class nova::keystone::auth( Boolean $configure_user_role = true, Boolean $configure_service = true, ) { - include nova::deps Keystone::Resource::Service_identity['nova'] -> Anchor['nova::service::end'] @@ -120,5 +119,4 @@ class nova::keystone::auth( admin_url => $admin_url, internal_url => $internal_url, } - } diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 3e888131b..f9d31d1da 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -194,7 +194,7 @@ # (Optional) Hash of additional parameters to pass through to the keystone # authtoken class. Values set here override the individual parameters above. # -class nova::keystone::authtoken( +class nova::keystone::authtoken ( String[1] $password, $username = 'nova', $auth_url = 'http://127.0.0.1:5000', @@ -234,7 +234,6 @@ class nova::keystone::authtoken( $interface = $facts['os_service_default'], $params = {}, ) { - include nova::deps keystone::resource::authtoken { diff --git a/manifests/keystone/service_user.pp b/manifests/keystone/service_user.pp index 4932ff559..f55af92f4 100644 --- a/manifests/keystone/service_user.pp +++ b/manifests/keystone/service_user.pp @@ -67,7 +67,7 @@ # (Optional) The region in which the identity server can be found. # Defaults to $facts['os_service_default']. # -class nova::keystone::service_user( +class nova::keystone::service_user ( $username = 'nova', $password = $facts['os_service_default'], $auth_url = 'http://127.0.0.1:5000/', @@ -84,7 +84,6 @@ class nova::keystone::service_user( $keyfile = $facts['os_service_default'], $region_name = $facts['os_service_default'], ) { - include nova::deps keystone::resource::service_user { 'nova_config': diff --git a/manifests/limit.pp b/manifests/limit.pp index 8e3ab595e..8e5e79a24 100644 --- a/manifests/limit.pp +++ b/manifests/limit.pp @@ -72,7 +72,7 @@ # (Optional) Always use this endpoint URL for requests for this client. # Defaults to $facts['os_service_default']. # -class nova::limit( +class nova::limit ( String[1] $password, Optional[String[1]] $endpoint_id = undef, String[1] $endpoint_service_name = 'nova', @@ -91,7 +91,6 @@ class nova::limit( $region_name = $facts['os_service_default'], $endpoint_override = $facts['os_service_default'], ) { - include nova::deps if $endpoint_id != undef { diff --git a/manifests/logging.pp b/manifests/logging.pp index 8adc38370..5c723a05e 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -97,7 +97,7 @@ # Defaults to $facts['os_service_default'] # Example: 'Y-%m-%d %H:%M:%S' # -class nova::logging( +class nova::logging ( $use_syslog = $facts['os_service_default'], $use_json = $facts['os_service_default'], $use_journal = $facts['os_service_default'], @@ -118,7 +118,6 @@ class nova::logging( $instance_uuid_format = $facts['os_service_default'], $log_date_format = $facts['os_service_default'], ) { - include nova::deps include nova::params @@ -143,5 +142,4 @@ class nova::logging( instance_uuid_format => $instance_uuid_format, log_date_format => $log_date_format, } - } diff --git a/manifests/metadata.pp b/manifests/metadata.pp index f1e45dc30..02550b0c3 100644 --- a/manifests/metadata.pp +++ b/manifests/metadata.pp @@ -28,13 +28,12 @@ # (optional) domain to use for building the hostnames # Defaults to $facts['os_service_default'] # -class nova::metadata( +class nova::metadata ( $neutron_metadata_proxy_shared_secret = undef, $metadata_cache_expiration = $facts['os_service_default'], $local_metadata_per_cell = $facts['os_service_default'], $dhcp_domain = $facts['os_service_default'], ) inherits nova::params { - include nova::deps nova_config { @@ -43,7 +42,7 @@ class nova::metadata( 'api/local_metadata_per_cell': value => $local_metadata_per_cell; } - if ($neutron_metadata_proxy_shared_secret){ + if ($neutron_metadata_proxy_shared_secret) { nova_config { 'neutron/service_metadata_proxy': value => true; 'neutron/metadata_proxy_shared_secret': diff --git a/manifests/migration/libvirt.pp b/manifests/migration/libvirt.pp index 0bd6f0bf0..75c85eeda 100644 --- a/manifests/migration/libvirt.pp +++ b/manifests/migration/libvirt.pp @@ -170,7 +170,7 @@ # the availability of native encryption support in the hypervisor. # Defaults to undef # -class nova::migration::libvirt( +class nova::migration::libvirt ( Boolean $manage_service = true, Enum['tcp', 'tls', 'ssh'] $transport = 'tcp', Enum['sasl', 'none'] $auth = 'none', @@ -202,7 +202,6 @@ class nova::migration::libvirt( # DEPRECATED PARAMETERS $live_migration_tunnelled = undef, ) inherits nova::params { - include nova::deps if $live_migration_tunnelled != undef { @@ -388,7 +387,6 @@ class nova::migration::libvirt( path => ['/sbin', '/usr/sbin', '/bin', '/usr/bin'], refreshonly => true, } ~> Service[$socket_name] - } else { $listen_address_real = normalize_ip_for_uri($listen_address) diff --git a/manifests/migration/qemu.pp b/manifests/migration/qemu.pp index 88edebf8d..15130c72d 100644 --- a/manifests/migration/qemu.pp +++ b/manifests/migration/qemu.pp @@ -25,14 +25,13 @@ # (optional) Higher limit of port range used for migration. # Defaults to $facts['os_service_default']. # -class nova::migration::qemu( +class nova::migration::qemu ( Boolean $configure_qemu = false, $migration_address = $facts['os_service_default'], $migration_host = $facts['os_service_default'], $migration_port_min = $facts['os_service_default'], $migration_port_max = $facts['os_service_default'], -){ - +) { include nova::deps Qemu_config<||> ~> Service<| tag == 'libvirt-qemu-service' |> diff --git a/manifests/network/neutron.pp b/manifests/network/neutron.pp index 3683a6b25..f2ba619c7 100644 --- a/manifests/network/neutron.pp +++ b/manifests/network/neutron.pp @@ -113,7 +113,6 @@ class nova::network::neutron ( $vif_plugging_timeout = $facts['os_service_default'], $default_floating_pool = $facts['os_service_default'], ) { - include nova::deps if is_service_default($system_scope) { diff --git a/manifests/os_brick.pp b/manifests/os_brick.pp index b4af3fc72..38b9bfc2e 100644 --- a/manifests/os_brick.pp +++ b/manifests/os_brick.pp @@ -17,12 +17,11 @@ # (Optional) Interval value to wait for multipath device to be ready for I/O. # Defaults to $facts['os_service_default'] # -class nova::os_brick( +class nova::os_brick ( $lock_path = $facts['os_service_default'], $wait_mpath_device_attempts = $facts['os_service_default'], $wait_mpath_device_interval = $facts['os_service_default'], ) { - oslo::os_brick { 'nova_config': lock_path => $lock_path, wait_mpath_device_attempts => $wait_mpath_device_attempts, diff --git a/manifests/params.pp b/manifests/params.pp index 8e63807b9..f6774a0b6 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -142,5 +142,4 @@ class nova::params { fail("Unsupported osfamily: ${facts['os']['family']}") } } - } diff --git a/manifests/pci.pp b/manifests/pci.pp index 2a7bf182f..8a88fd6b4 100644 --- a/manifests/pci.pp +++ b/manifests/pci.pp @@ -11,7 +11,7 @@ # [{"vendor_id" => "1234", "product_id" => "5678", "name" => "default"}, # {"vendor_id" => "1234", "product_id" => "6789", "name" => "other"}] -class nova::pci( +class nova::pci ( Array[Hash] $aliases = [] ) { include nova::deps diff --git a/manifests/placement.pp b/manifests/placement.pp index 22778d758..1e8ba6294 100644 --- a/manifests/placement.pp +++ b/manifests/placement.pp @@ -52,7 +52,7 @@ # and not the Identity service API IP and port. # Defaults to 'http://127.0.0.1:5000/v3' # -class nova::placement( +class nova::placement ( $password, $auth_type = 'password', $auth_url = 'http://127.0.0.1:5000/v3', @@ -64,7 +64,6 @@ class nova::placement( $user_domain_name = 'Default', $username = 'placement', ) inherits nova::params { - include nova::deps if is_service_default($system_scope) { @@ -87,5 +86,4 @@ class nova::placement( 'placement/region_name': value => $region_name; 'placement/valid_interfaces': value => join(any2array($valid_interfaces), ','); } - } diff --git a/manifests/policy.pp b/manifests/policy.pp index 6b5785b4f..68c574932 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -54,7 +54,6 @@ class nova::policy ( $policy_dirs = $facts['os_service_default'], Boolean $purge_config = false, ) { - include nova::deps include nova::params @@ -82,5 +81,4 @@ class nova::policy ( policy_default_rule => $policy_default_rule, policy_dirs => $policy_dirs, } - } diff --git a/manifests/quota.pp b/manifests/quota.pp index 443643d4e..b49f649fe 100644 --- a/manifests/quota.pp +++ b/manifests/quota.pp @@ -66,7 +66,7 @@ # limits. # Defaults to $facts['os_service_default'] # -class nova::quota( +class nova::quota ( $driver = $facts['os_service_default'], $instances = $facts['os_service_default'], $cores = $facts['os_service_default'], @@ -83,7 +83,6 @@ class nova::quota( $unified_limits_resource_strategy = $facts['os_service_default'], $unified_limits_resource_list = $facts['os_service_default'], ) { - include nova::deps nova_config { diff --git a/manifests/reports.pp b/manifests/reports.pp index 9d2e4b04b..8ca028b76 100644 --- a/manifests/reports.pp +++ b/manifests/reports.pp @@ -17,12 +17,11 @@ # is set. # Defaults to $facts['os_service_default'] # -class nova::reports( +class nova::reports ( $log_dir = $facts['os_service_default'], $file_event_handler = $facts['os_service_default'], $file_event_handler_interval = $facts['os_service_default'], ) { - include nova::deps oslo::reports { 'nova_config': diff --git a/manifests/scheduler.pp b/manifests/scheduler.pp index 0f75fa2da..e11f7bed0 100644 --- a/manifests/scheduler.pp +++ b/manifests/scheduler.pp @@ -66,7 +66,7 @@ # compute hosts affined to routed network segment aggregates. # Defaults to $facts['os_service_default'] # -class nova::scheduler( +class nova::scheduler ( Boolean $enabled = true, Boolean $manage_service = true, $ensure_package = 'present', @@ -80,7 +80,6 @@ class nova::scheduler( $enable_isolated_aggregate_filtering = $facts['os_service_default'], $query_placement_for_routed_network_aggregates = $facts['os_service_default'], ) { - include nova::deps include nova::db include nova::params diff --git a/manifests/scheduler/filter.pp b/manifests/scheduler/filter.pp index 8b41deac6..ff96752c4 100644 --- a/manifests/scheduler/filter.pp +++ b/manifests/scheduler/filter.pp @@ -134,7 +134,6 @@ class nova::scheduler::filter ( $aggregate_image_properties_isolation_separator = $facts['os_service_default'], $pci_in_placement = $facts['os_service_default'], ) { - include nova::deps if empty($available_filters) { @@ -194,5 +193,4 @@ class nova::scheduler::filter ( 'filter_scheduler/pci_in_placement': value => $pci_in_placement; } - } diff --git a/manifests/serialproxy.pp b/manifests/serialproxy.pp index b5eeb7117..e4ddf5ff1 100644 --- a/manifests/serialproxy.pp +++ b/manifests/serialproxy.pp @@ -24,14 +24,13 @@ # (optional) The state of the nova-serialproxy package # Defaults to 'present' # -class nova::serialproxy( +class nova::serialproxy ( Boolean $enabled = true, Boolean $manage_service = true, $serialproxy_host = $facts['os_service_default'], $serialproxy_port = $facts['os_service_default'], $ensure_package = 'present' ) { - include nova::deps include nova::params @@ -47,5 +46,4 @@ class nova::serialproxy( service_name => $nova::params::serialproxy_service_name, ensure_package => $ensure_package, } - } diff --git a/manifests/spicehtml5proxy.pp b/manifests/spicehtml5proxy.pp index 017cbf806..2eeeeb5cc 100644 --- a/manifests/spicehtml5proxy.pp +++ b/manifests/spicehtml5proxy.pp @@ -28,14 +28,13 @@ # (optional) Ensure package state # Defaults to 'present' # -class nova::spicehtml5proxy( +class nova::spicehtml5proxy ( Boolean $enabled = true, Boolean $manage_service = true, $host = '0.0.0.0', $port = '6082', $ensure_package = 'present' ) { - include nova::deps include nova::params diff --git a/manifests/vendordata.pp b/manifests/vendordata.pp index b9500a9c9..4c0573633 100644 --- a/manifests/vendordata.pp +++ b/manifests/vendordata.pp @@ -74,7 +74,7 @@ # (optional) User name for the vendordata dynamic plugin credentials. # Defaults to $facts['os_service_default'] # -class nova::vendordata( +class nova::vendordata ( $vendordata_jsonfile_path = $facts['os_service_default'], $vendordata_providers = $facts['os_service_default'], $vendordata_dynamic_targets = $facts['os_service_default'], @@ -93,13 +93,13 @@ class nova::vendordata( ) inherits nova::params { include nova::deps - if !is_service_default($vendordata_providers) and !empty($vendordata_providers){ + if !is_service_default($vendordata_providers) and !empty($vendordata_providers) { $vendordata_providers_real = join(any2array($vendordata_providers), ',') } else { $vendordata_providers_real = $facts['os_service_default'] } - if !is_service_default($vendordata_dynamic_targets) and !empty($vendordata_dynamic_targets){ + if !is_service_default($vendordata_dynamic_targets) and !empty($vendordata_dynamic_targets) { $vendordata_dynamic_targets_real = join(any2array($vendordata_dynamic_targets), ',') } else { $vendordata_dynamic_targets_real = $facts['os_service_default'] diff --git a/manifests/vncproxy.pp b/manifests/vncproxy.pp index 07341ddfd..5d0d795fa 100644 --- a/manifests/vncproxy.pp +++ b/manifests/vncproxy.pp @@ -60,7 +60,7 @@ # to VNC servers that supporting vencrypt # Defaults to $facts['os_service_default'] # -class nova::vncproxy( +class nova::vncproxy ( Boolean $enabled = true, Boolean $manage_service = true, Enum['http', 'https'] $vncproxy_protocol = 'http', @@ -74,7 +74,6 @@ class nova::vncproxy( $vencrypt_cert = undef, $vencrypt_ca = $facts['os_service_default'], ) { - include nova::deps include nova::params @@ -83,7 +82,6 @@ class nova::vncproxy( } if $allow_vencrypt { - if (!$vencrypt_cert or !$vencrypt_key) { 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, ensure_package => $ensure_package, } - } diff --git a/manifests/vncproxy/common.pp b/manifests/vncproxy/common.pp index 0d034af19..252430c88 100644 --- a/manifests/vncproxy/common.pp +++ b/manifests/vncproxy/common.pp @@ -22,7 +22,6 @@ class nova::vncproxy::common ( Optional[Stdlib::Port] $vncproxy_port = undef, Optional[String] $vncproxy_path = undef, ) { - include nova::deps if defined('$nova::compute::vncproxy_host') { diff --git a/manifests/workarounds.pp b/manifests/workarounds.pp index 736b6bf4f..4e600a5d1 100644 --- a/manifests/workarounds.pp +++ b/manifests/workarounds.pp @@ -80,6 +80,7 @@ class nova::workarounds ( # DEPRECATED PARAMETER $enable_numa_live_migration = undef, ) { + include nova::deps if $enable_numa_live_migration != undef { warning('The enable_numa_live_migration parameter is deprecated') @@ -110,5 +111,4 @@ class nova::workarounds ( 'workarounds/skip_cpu_compare_at_startup': value => $skip_cpu_compare_at_startup; } - } diff --git a/manifests/wsgi/apache_api.pp b/manifests/wsgi/apache_api.pp index 8a2438fe2..e8e9c465a 100644 --- a/manifests/wsgi/apache_api.pp +++ b/manifests/wsgi/apache_api.pp @@ -166,7 +166,6 @@ class nova::wsgi::apache_api ( $request_headers = undef, $vhost_custom_fragment = undef, ) { - include nova::params if ! defined(Class[nova::api]) { diff --git a/manifests/wsgi/apache_metadata.pp b/manifests/wsgi/apache_metadata.pp index f9b55979f..c1f9477ea 100644 --- a/manifests/wsgi/apache_metadata.pp +++ b/manifests/wsgi/apache_metadata.pp @@ -171,7 +171,6 @@ class nova::wsgi::apache_metadata ( $request_headers = undef, $vhost_custom_fragment = undef, ) { - include nova::params nova::generic_service { 'metadata-api': diff --git a/manifests/wsgi/uwsgi_api.pp b/manifests/wsgi/uwsgi_api.pp index b2967d10e..0c92c535a 100644 --- a/manifests/wsgi/uwsgi_api.pp +++ b/manifests/wsgi/uwsgi_api.pp @@ -25,11 +25,10 @@ class nova::wsgi::uwsgi_api ( $processes = $facts['os_workers'], $threads = 1, $listen_queue_size = 100, -){ - +) { include nova::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.') } diff --git a/manifests/wsgi/uwsgi_api_metadata.pp b/manifests/wsgi/uwsgi_api_metadata.pp index 90e45bbee..10af7ed9e 100644 --- a/manifests/wsgi/uwsgi_api_metadata.pp +++ b/manifests/wsgi/uwsgi_api_metadata.pp @@ -25,11 +25,10 @@ class nova::wsgi::uwsgi_api_metadata ( $processes = $facts['os_workers'], $threads = 1, $listen_queue_size = 100, -){ - +) { include nova::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.') }