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:
@@ -46,4 +46,3 @@ class { 'nova::vncproxy':
|
|||||||
enabled => false,
|
enabled => false,
|
||||||
manage_service => false,
|
manage_service => false,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -135,7 +135,7 @@
|
|||||||
# (optional) Number of workers for metadata service
|
# (optional) Number of workers for metadata service
|
||||||
# Defaults to undef
|
# Defaults to undef
|
||||||
#
|
#
|
||||||
class nova::api(
|
class nova::api (
|
||||||
Boolean $enabled = true,
|
Boolean $enabled = true,
|
||||||
Boolean $manage_service = true,
|
Boolean $manage_service = true,
|
||||||
$api_paste_config = 'api-paste.ini',
|
$api_paste_config = 'api-paste.ini',
|
||||||
@@ -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
|
||||||
@@ -247,7 +246,7 @@ as a standalone service, or httpd for being run by a httpd server")
|
|||||||
'DEFAULT/metadata_listen_port': ensure => absent;
|
'DEFAULT/metadata_listen_port': ensure => absent;
|
||||||
}
|
}
|
||||||
|
|
||||||
oslo::middleware {'nova_config':
|
oslo::middleware { 'nova_config':
|
||||||
enable_proxy_headers_parsing => $enable_proxy_headers_parsing,
|
enable_proxy_headers_parsing => $enable_proxy_headers_parsing,
|
||||||
max_request_body_size => $max_request_body_size,
|
max_request_body_size => $max_request_body_size,
|
||||||
}
|
}
|
||||||
|
@@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -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':
|
||||||
|
@@ -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
|
||||||
|
|
||||||
|
@@ -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
|
||||||
|
|
||||||
|
@@ -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
|
||||||
|
|
||||||
|
@@ -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
|
||||||
|
|
||||||
|
@@ -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']
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -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) {
|
||||||
|
@@ -8,7 +8,7 @@
|
|||||||
# (optional) The state for the nova client package
|
# (optional) The state for the nova client package
|
||||||
# Defaults to 'present'
|
# Defaults to 'present'
|
||||||
#
|
#
|
||||||
class nova::client(
|
class nova::client (
|
||||||
$ensure = 'present'
|
$ensure = 'present'
|
||||||
) {
|
) {
|
||||||
include nova::deps
|
include nova::deps
|
||||||
@@ -22,5 +22,4 @@ in a future release.")
|
|||||||
name => $nova::params::client_package,
|
name => $nova::params::client_package,
|
||||||
tag => 'openstack',
|
tag => 'openstack',
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -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
|
||||||
|
|
||||||
|
@@ -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 {
|
||||||
|
@@ -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
|
||||||
|
|
||||||
|
@@ -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
|
||||||
|
|
||||||
|
@@ -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)
|
||||||
|
@@ -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 {
|
||||||
|
@@ -8,10 +8,9 @@
|
|||||||
# (optional) Whether or not delete the default network.
|
# (optional) Whether or not delete the default network.
|
||||||
# Defaults to true.
|
# Defaults to true.
|
||||||
#
|
#
|
||||||
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 {
|
||||||
|
@@ -50,7 +50,7 @@
|
|||||||
# of the used OS installed via $nova::compute::libvirt::version::default .
|
# of the used OS installed via $nova::compute::libvirt::version::default .
|
||||||
# Defaults to $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,
|
Boolean $configure_qemu = false,
|
||||||
$user = undef,
|
$user = undef,
|
||||||
$group = undef,
|
$group = undef,
|
||||||
@@ -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 {
|
||||||
@@ -89,25 +87,24 @@ class nova::compute::libvirt::qemu(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if $user and !empty($user) {
|
if $user and !empty($user) {
|
||||||
qemu_config { 'user': value => $user, quote =>true }
|
qemu_config { 'user': value => $user, quote => true }
|
||||||
} else {
|
} else {
|
||||||
qemu_config { 'user': ensure => absent }
|
qemu_config { 'user': ensure => absent }
|
||||||
}
|
}
|
||||||
|
|
||||||
if $group and !empty($group) {
|
if $group and !empty($group) {
|
||||||
qemu_config { 'group': value => $group, quote =>true }
|
qemu_config { 'group': value => $group, quote => true }
|
||||||
} else {
|
} else {
|
||||||
qemu_config { 'group': ensure => absent }
|
qemu_config { 'group': ensure => absent }
|
||||||
}
|
}
|
||||||
|
|
||||||
if $memory_backing_dir and !empty($memory_backing_dir) {
|
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 {
|
} else {
|
||||||
qemu_config { 'memory_backing_dir': ensure => absent }
|
qemu_config { 'memory_backing_dir': ensure => absent }
|
||||||
}
|
}
|
||||||
|
|
||||||
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;
|
||||||
|
@@ -30,13 +30,12 @@
|
|||||||
# (Optional) Directory to store files related to secrets.
|
# (Optional) Directory to store files related to secrets.
|
||||||
# Defaults to /etc/nova
|
# 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,
|
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,
|
Stdlib::Base64 $value,
|
||||||
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,
|
||||||
|
@@ -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
|
||||||
|
|
||||||
|
@@ -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 {
|
||||||
|
@@ -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 {
|
||||||
|
@@ -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 {
|
||||||
|
@@ -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 {
|
||||||
|
@@ -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 {
|
||||||
|
@@ -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 {
|
||||||
|
@@ -28,14 +28,12 @@ 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 {
|
||||||
'log_level': value => $log_level;
|
'log_level': value => $log_level;
|
||||||
'log_filters': value => join(any2array($log_filters), ' '), quote => true;
|
'log_filters': value => join(any2array($log_filters), ' '), quote => true;
|
||||||
'log_outputs': value => join(any2array($log_outputs), ' '), quote => true;
|
'log_outputs': value => join(any2array($log_outputs), ' '), quote => true;
|
||||||
'ovs_timeout': value => $ovs_timeout;
|
'ovs_timeout': value => $ovs_timeout;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -8,7 +8,7 @@
|
|||||||
# (Optional) A hash to define the nova::compute::mdev_type resources.
|
# (Optional) A hash to define the nova::compute::mdev_type resources.
|
||||||
# Defaults to {}
|
# Defaults to {}
|
||||||
#
|
#
|
||||||
class nova::compute::mdev(
|
class nova::compute::mdev (
|
||||||
Hash $mdev_types = {},
|
Hash $mdev_types = {},
|
||||||
) {
|
) {
|
||||||
include nova::deps
|
include nova::deps
|
||||||
|
@@ -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;
|
||||||
|
@@ -21,7 +21,7 @@
|
|||||||
# (optional) Pci passthrough list of hash.
|
# (optional) Pci passthrough list of hash.
|
||||||
# Defaults to undef
|
# Defaults to undef
|
||||||
#
|
#
|
||||||
class nova::compute::pci(
|
class nova::compute::pci (
|
||||||
Array[Hash] $device_specs = [],
|
Array[Hash] $device_specs = [],
|
||||||
$report_in_placement = $facts['os_service_default'],
|
$report_in_placement = $facts['os_service_default'],
|
||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
|
@@ -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
|
||||||
|
|
||||||
|
@@ -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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -17,12 +17,11 @@
|
|||||||
# should connect (string value)
|
# should connect (string value)
|
||||||
# Defaults to $facts['os_service_default']
|
# Defaults to $facts['os_service_default']
|
||||||
#
|
#
|
||||||
class nova::compute::serial(
|
class nova::compute::serial (
|
||||||
$port_range = $facts['os_service_default'],
|
$port_range = $facts['os_service_default'],
|
||||||
$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 {
|
||||||
|
@@ -38,7 +38,7 @@
|
|||||||
# (optional) Path of the spice html file for the html5 console proxy
|
# (optional) Path of the spice html file for the html5 console proxy
|
||||||
# Defaults to '/spice_auto.html'
|
# Defaults to '/spice_auto.html'
|
||||||
#
|
#
|
||||||
class nova::compute::spice(
|
class nova::compute::spice (
|
||||||
Boolean $agent_enabled = true,
|
Boolean $agent_enabled = true,
|
||||||
$server_listen = $facts['os_service_default'],
|
$server_listen = $facts['os_service_default'],
|
||||||
$server_proxyclient_address = $facts['os_service_default'],
|
$server_proxyclient_address = $facts['os_service_default'],
|
||||||
@@ -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 {
|
||||||
|
@@ -27,14 +27,13 @@
|
|||||||
# by the conductor service which is responsible for creating the service entries.
|
# by the conductor service which is responsible for creating the service entries.
|
||||||
# Defaults to $facts['os_service_default']
|
# Defaults to $facts['os_service_default']
|
||||||
#
|
#
|
||||||
class nova::conductor(
|
class nova::conductor (
|
||||||
Boolean $enabled = true,
|
Boolean $enabled = true,
|
||||||
Boolean $manage_service = true,
|
Boolean $manage_service = true,
|
||||||
$ensure_package = 'present',
|
$ensure_package = 'present',
|
||||||
$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
|
||||||
|
@@ -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)
|
||||||
|
@@ -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 {
|
||||||
|
@@ -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':
|
||||||
|
@@ -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 {
|
||||||
|
@@ -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
|
||||||
|
|
||||||
|
@@ -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':
|
||||||
|
@@ -36,7 +36,7 @@
|
|||||||
# be set to true by default in Ocata when the cell v2 setup is mandatory.
|
# be set to true by default in Ocata when the cell v2 setup is mandatory.
|
||||||
# Defaults to true
|
# Defaults to true
|
||||||
#
|
#
|
||||||
class nova::db::mysql(
|
class nova::db::mysql (
|
||||||
String[1] $password,
|
String[1] $password,
|
||||||
$dbname = 'nova',
|
$dbname = 'nova',
|
||||||
$user = 'nova',
|
$user = 'nova',
|
||||||
|
@@ -31,7 +31,7 @@
|
|||||||
# (Optional) Additional hosts that are allowed to access this DB
|
# (Optional) Additional hosts that are allowed to access this DB
|
||||||
# Defaults to undef
|
# Defaults to undef
|
||||||
#
|
#
|
||||||
class nova::db::mysql_api(
|
class nova::db::mysql_api (
|
||||||
$password,
|
$password,
|
||||||
$dbname = 'nova_api',
|
$dbname = 'nova_api',
|
||||||
$user = 'nova_api',
|
$user = 'nova_api',
|
||||||
@@ -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':
|
||||||
|
@@ -13,11 +13,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 nova::db::online_data_migrations(
|
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
|
||||||
|
|
||||||
|
@@ -29,7 +29,7 @@
|
|||||||
# be set to true by default in Ocata when the cell v2 setup is mandatory.
|
# be set to true by default in Ocata when the cell v2 setup is mandatory.
|
||||||
# Defaults to true
|
# Defaults to true
|
||||||
#
|
#
|
||||||
class nova::db::postgresql(
|
class nova::db::postgresql (
|
||||||
String[1] $password,
|
String[1] $password,
|
||||||
$dbname = 'nova',
|
$dbname = 'nova',
|
||||||
$user = 'nova',
|
$user = 'nova',
|
||||||
@@ -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':
|
||||||
|
@@ -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 nova::db::postgresql_api(
|
class nova::db::postgresql_api (
|
||||||
$password,
|
$password,
|
||||||
$dbname = 'nova_api',
|
$dbname = 'nova_api',
|
||||||
$user = 'nova_api',
|
$user = 'nova_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':
|
||||||
|
@@ -13,11 +13,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 nova::db::sync(
|
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
|
||||||
|
|
||||||
|
@@ -21,12 +21,11 @@
|
|||||||
# (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 nova::db::sync_api(
|
class nova::db::sync_api (
|
||||||
$extra_params = undef,
|
$extra_params = undef,
|
||||||
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
|
||||||
|
|
||||||
|
@@ -30,14 +30,13 @@
|
|||||||
# (optional) Control the ensure parameter for the package resource.
|
# (optional) Control the ensure parameter for the package resource.
|
||||||
# Defaults to 'present'.
|
# Defaults to 'present'.
|
||||||
#
|
#
|
||||||
define nova::generic_service(
|
define nova::generic_service (
|
||||||
$package_name,
|
$package_name,
|
||||||
$service_name,
|
$service_name,
|
||||||
Boolean $enabled = true,
|
Boolean $enabled = true,
|
||||||
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
|
||||||
|
|
||||||
|
@@ -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 {
|
||||||
|
@@ -363,7 +363,7 @@
|
|||||||
# will be run through a green thread.
|
# will be run through a green thread.
|
||||||
# Defaults to undef
|
# Defaults to undef
|
||||||
#
|
#
|
||||||
class nova(
|
class nova (
|
||||||
$ensure_package = 'present',
|
$ensure_package = 'present',
|
||||||
$default_transport_url = $facts['os_service_default'],
|
$default_transport_url = $facts['os_service_default'],
|
||||||
$rpc_response_timeout = $facts['os_service_default'],
|
$rpc_response_timeout = $facts['os_service_default'],
|
||||||
@@ -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,
|
||||||
@@ -524,7 +522,7 @@ class nova(
|
|||||||
'DEFAULT/cell_worker_thread_pool_size': value => $cell_worker_thread_pool_size;
|
'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,
|
rabbit_use_ssl => $rabbit_use_ssl,
|
||||||
heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold,
|
heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold,
|
||||||
heartbeat_rate => $rabbit_heartbeat_rate,
|
heartbeat_rate => $rabbit_heartbeat_rate,
|
||||||
|
@@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -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':
|
||||||
|
@@ -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
|
||||||
|
@@ -62,7 +62,7 @@
|
|||||||
# (Optional) The region in which the identity server can be found.
|
# (Optional) The region in which the identity server can be found.
|
||||||
# Defaults to $facts['os_service_default'].
|
# Defaults to $facts['os_service_default'].
|
||||||
#
|
#
|
||||||
class nova::key_manager::barbican::service_user(
|
class nova::key_manager::barbican::service_user (
|
||||||
$password,
|
$password,
|
||||||
$username = 'nova',
|
$username = 'nova',
|
||||||
$auth_url = 'http://localhost:5000',
|
$auth_url = 'http://localhost:5000',
|
||||||
@@ -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':
|
||||||
|
@@ -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) {
|
||||||
|
@@ -75,7 +75,7 @@
|
|||||||
# (Optional) Should the service be configurd?
|
# (Optional) Should the service be configurd?
|
||||||
# Defaults to True
|
# Defaults to True
|
||||||
#
|
#
|
||||||
class nova::keystone::auth(
|
class nova::keystone::auth (
|
||||||
String[1] $password,
|
String[1] $password,
|
||||||
String[1] $auth_name = 'nova',
|
String[1] $auth_name = 'nova',
|
||||||
String[1] $service_name = 'nova',
|
String[1] $service_name = 'nova',
|
||||||
@@ -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,
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -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 nova::keystone::authtoken(
|
class nova::keystone::authtoken (
|
||||||
String[1] $password,
|
String[1] $password,
|
||||||
$username = 'nova',
|
$username = 'nova',
|
||||||
$auth_url = 'http://127.0.0.1:5000',
|
$auth_url = 'http://127.0.0.1:5000',
|
||||||
@@ -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 {
|
||||||
|
@@ -67,7 +67,7 @@
|
|||||||
# (Optional) The region in which the identity server can be found.
|
# (Optional) The region in which the identity server can be found.
|
||||||
# Defaults to $facts['os_service_default'].
|
# Defaults to $facts['os_service_default'].
|
||||||
#
|
#
|
||||||
class nova::keystone::service_user(
|
class nova::keystone::service_user (
|
||||||
$username = 'nova',
|
$username = 'nova',
|
||||||
$password = $facts['os_service_default'],
|
$password = $facts['os_service_default'],
|
||||||
$auth_url = 'http://127.0.0.1:5000/',
|
$auth_url = 'http://127.0.0.1:5000/',
|
||||||
@@ -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':
|
||||||
|
@@ -72,7 +72,7 @@
|
|||||||
# (Optional) Always use this endpoint URL for requests for this client.
|
# (Optional) Always use this endpoint URL for requests for this client.
|
||||||
# Defaults to $facts['os_service_default'].
|
# Defaults to $facts['os_service_default'].
|
||||||
#
|
#
|
||||||
class nova::limit(
|
class nova::limit (
|
||||||
String[1] $password,
|
String[1] $password,
|
||||||
Optional[String[1]] $endpoint_id = undef,
|
Optional[String[1]] $endpoint_id = undef,
|
||||||
String[1] $endpoint_service_name = 'nova',
|
String[1] $endpoint_service_name = 'nova',
|
||||||
@@ -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 {
|
||||||
|
@@ -97,7 +97,7 @@
|
|||||||
# Defaults to $facts['os_service_default']
|
# Defaults to $facts['os_service_default']
|
||||||
# Example: 'Y-%m-%d %H:%M:%S'
|
# Example: 'Y-%m-%d %H:%M:%S'
|
||||||
#
|
#
|
||||||
class nova::logging(
|
class nova::logging (
|
||||||
$use_syslog = $facts['os_service_default'],
|
$use_syslog = $facts['os_service_default'],
|
||||||
$use_json = $facts['os_service_default'],
|
$use_json = $facts['os_service_default'],
|
||||||
$use_journal = $facts['os_service_default'],
|
$use_journal = $facts['os_service_default'],
|
||||||
@@ -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,
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -28,13 +28,12 @@
|
|||||||
# (optional) domain to use for building the hostnames
|
# (optional) domain to use for building the hostnames
|
||||||
# Defaults to $facts['os_service_default']
|
# Defaults to $facts['os_service_default']
|
||||||
#
|
#
|
||||||
class nova::metadata(
|
class nova::metadata (
|
||||||
$neutron_metadata_proxy_shared_secret = undef,
|
$neutron_metadata_proxy_shared_secret = undef,
|
||||||
$metadata_cache_expiration = $facts['os_service_default'],
|
$metadata_cache_expiration = $facts['os_service_default'],
|
||||||
$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 {
|
||||||
@@ -43,7 +42,7 @@ class nova::metadata(
|
|||||||
'api/local_metadata_per_cell': value => $local_metadata_per_cell;
|
'api/local_metadata_per_cell': value => $local_metadata_per_cell;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($neutron_metadata_proxy_shared_secret){
|
if ($neutron_metadata_proxy_shared_secret) {
|
||||||
nova_config {
|
nova_config {
|
||||||
'neutron/service_metadata_proxy': value => true;
|
'neutron/service_metadata_proxy': value => true;
|
||||||
'neutron/metadata_proxy_shared_secret':
|
'neutron/metadata_proxy_shared_secret':
|
||||||
|
@@ -170,7 +170,7 @@
|
|||||||
# the availability of native encryption support in the hypervisor.
|
# the availability of native encryption support in the hypervisor.
|
||||||
# Defaults to undef
|
# Defaults to undef
|
||||||
#
|
#
|
||||||
class nova::migration::libvirt(
|
class nova::migration::libvirt (
|
||||||
Boolean $manage_service = true,
|
Boolean $manage_service = true,
|
||||||
Enum['tcp', 'tls', 'ssh'] $transport = 'tcp',
|
Enum['tcp', 'tls', 'ssh'] $transport = 'tcp',
|
||||||
Enum['sasl', 'none'] $auth = 'none',
|
Enum['sasl', 'none'] $auth = 'none',
|
||||||
@@ -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)
|
||||||
|
|
||||||
|
@@ -25,14 +25,13 @@
|
|||||||
# (optional) Higher limit of port range used for migration.
|
# (optional) Higher limit of port range used for migration.
|
||||||
# Defaults to $facts['os_service_default'].
|
# Defaults to $facts['os_service_default'].
|
||||||
#
|
#
|
||||||
class nova::migration::qemu(
|
class nova::migration::qemu (
|
||||||
Boolean $configure_qemu = false,
|
Boolean $configure_qemu = false,
|
||||||
$migration_address = $facts['os_service_default'],
|
$migration_address = $facts['os_service_default'],
|
||||||
$migration_host = $facts['os_service_default'],
|
$migration_host = $facts['os_service_default'],
|
||||||
$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' |>
|
||||||
|
@@ -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) {
|
||||||
|
@@ -17,12 +17,11 @@
|
|||||||
# (Optional) Interval value to wait for multipath device to be ready for I/O.
|
# (Optional) Interval value to wait for multipath device to be ready for I/O.
|
||||||
# Defaults to $facts['os_service_default']
|
# Defaults to $facts['os_service_default']
|
||||||
#
|
#
|
||||||
class nova::os_brick(
|
class nova::os_brick (
|
||||||
$lock_path = $facts['os_service_default'],
|
$lock_path = $facts['os_service_default'],
|
||||||
$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,
|
||||||
|
@@ -142,5 +142,4 @@ class nova::params {
|
|||||||
fail("Unsupported osfamily: ${facts['os']['family']}")
|
fail("Unsupported osfamily: ${facts['os']['family']}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -11,7 +11,7 @@
|
|||||||
# [{"vendor_id" => "1234", "product_id" => "5678", "name" => "default"},
|
# [{"vendor_id" => "1234", "product_id" => "5678", "name" => "default"},
|
||||||
# {"vendor_id" => "1234", "product_id" => "6789", "name" => "other"}]
|
# {"vendor_id" => "1234", "product_id" => "6789", "name" => "other"}]
|
||||||
|
|
||||||
class nova::pci(
|
class nova::pci (
|
||||||
Array[Hash] $aliases = []
|
Array[Hash] $aliases = []
|
||||||
) {
|
) {
|
||||||
include nova::deps
|
include nova::deps
|
||||||
|
@@ -52,7 +52,7 @@
|
|||||||
# and not the Identity service API IP and port.
|
# and not the Identity service API IP and port.
|
||||||
# Defaults to 'http://127.0.0.1:5000/v3'
|
# Defaults to 'http://127.0.0.1:5000/v3'
|
||||||
#
|
#
|
||||||
class nova::placement(
|
class nova::placement (
|
||||||
$password,
|
$password,
|
||||||
$auth_type = 'password',
|
$auth_type = 'password',
|
||||||
$auth_url = 'http://127.0.0.1:5000/v3',
|
$auth_url = 'http://127.0.0.1:5000/v3',
|
||||||
@@ -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), ',');
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -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,
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -66,7 +66,7 @@
|
|||||||
# limits.
|
# limits.
|
||||||
# Defaults to $facts['os_service_default']
|
# Defaults to $facts['os_service_default']
|
||||||
#
|
#
|
||||||
class nova::quota(
|
class nova::quota (
|
||||||
$driver = $facts['os_service_default'],
|
$driver = $facts['os_service_default'],
|
||||||
$instances = $facts['os_service_default'],
|
$instances = $facts['os_service_default'],
|
||||||
$cores = $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_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 {
|
||||||
|
@@ -17,12 +17,11 @@
|
|||||||
# is set.
|
# is set.
|
||||||
# Defaults to $facts['os_service_default']
|
# Defaults to $facts['os_service_default']
|
||||||
#
|
#
|
||||||
class nova::reports(
|
class nova::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 nova::deps
|
include nova::deps
|
||||||
|
|
||||||
oslo::reports { 'nova_config':
|
oslo::reports { 'nova_config':
|
||||||
|
@@ -66,7 +66,7 @@
|
|||||||
# compute hosts affined to routed network segment aggregates.
|
# compute hosts affined to routed network segment aggregates.
|
||||||
# Defaults to $facts['os_service_default']
|
# Defaults to $facts['os_service_default']
|
||||||
#
|
#
|
||||||
class nova::scheduler(
|
class nova::scheduler (
|
||||||
Boolean $enabled = true,
|
Boolean $enabled = true,
|
||||||
Boolean $manage_service = true,
|
Boolean $manage_service = true,
|
||||||
$ensure_package = 'present',
|
$ensure_package = 'present',
|
||||||
@@ -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
|
||||||
|
@@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -24,14 +24,13 @@
|
|||||||
# (optional) The state of the nova-serialproxy package
|
# (optional) The state of the nova-serialproxy package
|
||||||
# Defaults to 'present'
|
# Defaults to 'present'
|
||||||
#
|
#
|
||||||
class nova::serialproxy(
|
class nova::serialproxy (
|
||||||
Boolean $enabled = true,
|
Boolean $enabled = true,
|
||||||
Boolean $manage_service = true,
|
Boolean $manage_service = true,
|
||||||
$serialproxy_host = $facts['os_service_default'],
|
$serialproxy_host = $facts['os_service_default'],
|
||||||
$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,
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -28,14 +28,13 @@
|
|||||||
# (optional) Ensure package state
|
# (optional) Ensure package state
|
||||||
# Defaults to 'present'
|
# Defaults to 'present'
|
||||||
#
|
#
|
||||||
class nova::spicehtml5proxy(
|
class nova::spicehtml5proxy (
|
||||||
Boolean $enabled = true,
|
Boolean $enabled = true,
|
||||||
Boolean $manage_service = true,
|
Boolean $manage_service = true,
|
||||||
$host = '0.0.0.0',
|
$host = '0.0.0.0',
|
||||||
$port = '6082',
|
$port = '6082',
|
||||||
$ensure_package = 'present'
|
$ensure_package = 'present'
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include nova::deps
|
include nova::deps
|
||||||
include nova::params
|
include nova::params
|
||||||
|
|
||||||
|
@@ -74,7 +74,7 @@
|
|||||||
# (optional) User name for the vendordata dynamic plugin credentials.
|
# (optional) User name for the vendordata dynamic plugin credentials.
|
||||||
# Defaults to $facts['os_service_default']
|
# Defaults to $facts['os_service_default']
|
||||||
#
|
#
|
||||||
class nova::vendordata(
|
class nova::vendordata (
|
||||||
$vendordata_jsonfile_path = $facts['os_service_default'],
|
$vendordata_jsonfile_path = $facts['os_service_default'],
|
||||||
$vendordata_providers = $facts['os_service_default'],
|
$vendordata_providers = $facts['os_service_default'],
|
||||||
$vendordata_dynamic_targets = $facts['os_service_default'],
|
$vendordata_dynamic_targets = $facts['os_service_default'],
|
||||||
@@ -93,13 +93,13 @@ class nova::vendordata(
|
|||||||
) inherits nova::params {
|
) inherits nova::params {
|
||||||
include nova::deps
|
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), ',')
|
$vendordata_providers_real = join(any2array($vendordata_providers), ',')
|
||||||
} else {
|
} else {
|
||||||
$vendordata_providers_real = $facts['os_service_default']
|
$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), ',')
|
$vendordata_dynamic_targets_real = join(any2array($vendordata_dynamic_targets), ',')
|
||||||
} else {
|
} else {
|
||||||
$vendordata_dynamic_targets_real = $facts['os_service_default']
|
$vendordata_dynamic_targets_real = $facts['os_service_default']
|
||||||
|
@@ -60,7 +60,7 @@
|
|||||||
# to VNC servers that supporting vencrypt
|
# to VNC servers that supporting vencrypt
|
||||||
# Defaults to $facts['os_service_default']
|
# Defaults to $facts['os_service_default']
|
||||||
#
|
#
|
||||||
class nova::vncproxy(
|
class nova::vncproxy (
|
||||||
Boolean $enabled = true,
|
Boolean $enabled = true,
|
||||||
Boolean $manage_service = true,
|
Boolean $manage_service = true,
|
||||||
Enum['http', 'https'] $vncproxy_protocol = 'http',
|
Enum['http', 'https'] $vncproxy_protocol = 'http',
|
||||||
@@ -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,
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -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') {
|
||||||
|
@@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -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]) {
|
||||||
|
@@ -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':
|
||||||
|
@@ -25,11 +25,10 @@ class nova::wsgi::uwsgi_api (
|
|||||||
$processes = $facts['os_workers'],
|
$processes = $facts['os_workers'],
|
||||||
$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' {
|
||||||
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.')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -25,11 +25,10 @@ class nova::wsgi::uwsgi_api_metadata (
|
|||||||
$processes = $facts['os_workers'],
|
$processes = $facts['os_workers'],
|
||||||
$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' {
|
||||||
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.')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user