openstack/puppet-nova
Code Issues Proposed changes

Prepare for new lint plugins

Browse Source 
This fixes a few lint warnings/errors detected by the following plugins
we aim to enable soon.
 - puppet-lint-file_ensure-check
 - puppet-lint-trailing_comma-check
 - puppet-lint-topscope-variable-check

Change-Id: If7fb7d7b8de9698c912003e0c857341e5a201580
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-15 18:55:20 +09:00
parent ba3c637cbe
commit 800ad74994
35 changed files with 161 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/api.pp
View File

@@ -49,7 +49,7 @@
# service, and you must use another class to configure that # service, and you must use another class to configure that
# web service. For example, use class { 'nova::wsgi::apache'...} # web service. For example, use class { 'nova::wsgi::apache'...}
# to make nova be a web app using apache mod_wsgi. # to make nova be a web app using apache mod_wsgi.
# Defaults to '$::nova::params::api_service_name' # Defaults to '$nova::params::api_service_name'
# #
# [*metadata_service_name*] # [*metadata_service_name*]
# (optional) Name of the service that will be providing the # (optional) Name of the service that will be providing the
@@ -57,7 +57,7 @@
# If the value is undef, no management of the service will be # If the value is undef, no management of the service will be
# done by puppet. If the value is defined, and manage_service # done by puppet. If the value is defined, and manage_service
# is set to true, the service will be managed by Puppet. # is set to true, the service will be managed by Puppet.
# Default to $::nova::params::api_metadata_service_name # Default to $nova::params::api_metadata_service_name
# #
# [*max_limit*] # [*max_limit*]
# (optional) This option is limit the maximum number of items in a single response. # (optional) This option is limit the maximum number of items in a single response.
@@ -143,8 +143,8 @@ class nova::api(
Boolean $sync_db = true, Boolean $sync_db = true,
Boolean $sync_db_api = true, Boolean $sync_db_api = true,
Boolean $db_online_data_migrations = false, Boolean $db_online_data_migrations = false,
$service_name = $::nova::params::api_service_name, $service_name = $nova::params::api_service_name,
$metadata_service_name = $::nova::params::api_metadata_service_name, $metadata_service_name = $nova::params::api_metadata_service_name,
$enable_proxy_headers_parsing = $facts['os_service_default'], $enable_proxy_headers_parsing = $facts['os_service_default'],
$max_request_body_size = $facts['os_service_default'], $max_request_body_size = $facts['os_service_default'],
$max_limit = $facts['os_service_default'], $max_limit = $facts['os_service_default'],
@@ -184,7 +184,7 @@ class nova::api(
} }
} }
if $service_name == $::nova::params::api_service_name { if $service_name == $nova::params::api_service_name {
$service_enabled = $enabled $service_enabled = $enabled
if $manage_service { if $manage_service {
@@ -220,8 +220,8 @@ as a standalone service, or httpd for being run by a httpd server")
enabled => $service_enabled, enabled => $service_enabled,
manage_service => $manage_service, manage_service => $manage_service,
ensure_package => $ensure_package, ensure_package => $ensure_package,
package_name => $::nova::params::api_package_name, package_name => $nova::params::api_package_name,
service_name => $::nova::params::api_service_name, service_name => $nova::params::api_service_name,
} }
if $metadata_service_name { if $metadata_service_name {
@@ -232,7 +232,7 @@ as a standalone service, or httpd for being run by a httpd server")
enabled => $service_enabled, enabled => $service_enabled,
manage_service => $manage_service, manage_service => $manage_service,
ensure_package => $ensure_package, ensure_package => $ensure_package,
package_name => $::nova::params::api_package_name, package_name => $nova::params::api_package_name,
service_name => $metadata_service_name, service_name => $metadata_service_name,
} }
} }

4
manifests/cell_v2/discover_hosts.pp
View File

@@ -18,8 +18,8 @@ class nova::cell_v2::discover_hosts (
exec { 'nova-cell_v2-discover_hosts': exec { 'nova-cell_v2-discover_hosts':
path => ['/bin', '/usr/bin'], path => ['/bin', '/usr/bin'],
command => "nova-manage ${extra_params} cell_v2 discover_hosts", command => "nova-manage ${extra_params} cell_v2 discover_hosts",
user => $::nova::params::user, user => $nova::params::user,
refreshonly => true, refreshonly => true,
subscribe => Anchor['nova::service::end'] subscribe => Anchor['nova::service::end'],
} }
} }

2
manifests/cell_v2/map_cell0.pp
View File

@@ -21,7 +21,7 @@ class nova::cell_v2::map_cell0 (
exec { 'nova-cell_v2-map_cell0': exec { 'nova-cell_v2-map_cell0':
path => ['/bin', '/usr/bin'], path => ['/bin', '/usr/bin'],
command => "nova-manage ${extra_params} cell_v2 map_cell0", command => "nova-manage ${extra_params} cell_v2 map_cell0",
user => $::nova::params::user, user => $nova::params::user,
refreshonly => true, refreshonly => true,
logoutput => on_failure, logoutput => on_failure,
subscribe => Anchor['nova::cell_v2::begin'], subscribe => Anchor['nova::cell_v2::begin'],

2
manifests/cell_v2/map_cell_and_hosts.pp
View File

@@ -18,7 +18,7 @@ class nova::cell_v2::map_cell_and_hosts (
exec { 'nova-cell_v2-map_cell_and_hosts': exec { 'nova-cell_v2-map_cell_and_hosts':
path => ['/bin', '/usr/bin'], path => ['/bin', '/usr/bin'],
command => "nova-manage ${extra_params} cell_v2 map_cell_and_hosts", command => "nova-manage ${extra_params} cell_v2 map_cell_and_hosts",
user => $::nova::params::user, user => $nova::params::user,
refreshonly => true, refreshonly => true,
} }
} }

2
manifests/cell_v2/map_instances.pp
View File

@@ -43,7 +43,7 @@ class nova::cell_v2::map_instances (
exec { 'nova-cell_v2-map_instances': exec { 'nova-cell_v2-map_instances':
path => ['/bin', '/usr/bin'], path => ['/bin', '/usr/bin'],
command => "nova-manage ${extra_params} cell_v2 map_instances --cell_uuid=${cell_uuid_real}", command => "nova-manage ${extra_params} cell_v2 map_instances --cell_uuid=${cell_uuid_real}",
user => $::nova::params::user, user => $nova::params::user,
refreshonly => true, refreshonly => true,
} }
} }

4
manifests/cell_v2/simple_setup.pp
View File

@@ -39,12 +39,12 @@ class nova::cell_v2::simple_setup (
include nova::cell_v2::map_cell0 include nova::cell_v2::map_cell0
nova_cell_v2 { 'cell0': nova_cell_v2 { 'cell0':
database_connection => $database_connection_cell0 database_connection => $database_connection_cell0,
} }
nova_cell_v2 { 'default': nova_cell_v2 { 'default':
transport_url => $transport_url, transport_url => $transport_url,
database_connection => $database_connection database_connection => $database_connection,
} }
include nova::cell_v2::discover_hosts include nova::cell_v2::discover_hosts

2
manifests/client.pp
View File

@@ -19,7 +19,7 @@ in a future release.")
package { 'python-novaclient': package { 'python-novaclient':
ensure => $ensure, ensure => $ensure,
name => $::nova::params::client_package, name => $nova::params::client_package,
tag => 'openstack', tag => 'openstack',
} }

4
manifests/compute.pp
View File

@@ -434,8 +434,8 @@ class nova::compute (
nova::generic_service { 'compute': nova::generic_service { 'compute':
enabled => $enabled, enabled => $enabled,
manage_service => $manage_service, manage_service => $manage_service,
package_name => $::nova::params::compute_package_name, package_name => $nova::params::compute_package_name,
service_name => $::nova::params::compute_service_name, service_name => $nova::params::compute_service_name,
ensure_package => $ensure_package, ensure_package => $ensure_package,
} }

18
manifests/compute/libvirt.pp
View File

@@ -118,15 +118,15 @@
# #
# [*libvirt_service_name*] # [*libvirt_service_name*]
# (optional) libvirt service name. # (optional) libvirt service name.
# Defaults to $::nova::params::libvirt_service_name # Defaults to $nova::params::libvirt_service_name
# #
# [*virtlock_service_name*] # [*virtlock_service_name*]
# (optional) virtlock service name. # (optional) virtlock service name.
# Defaults to $::nova::params::virtlock_service_name # Defaults to $nova::params::virtlock_service_name
# #
# [*virtlog_service_name*] # [*virtlog_service_name*]
# (optional) virtlog service name. # (optional) virtlog service name.
# Defaults to $::nova::params::virtlog_service_name # Defaults to $nova::params::virtlog_service_name
# #
# [*compute_driver*] # [*compute_driver*]
# (optional) Compute driver. # (optional) Compute driver.
@@ -265,9 +265,9 @@ class nova::compute::libvirt (
$enabled_perf_events = $facts['os_service_default'], $enabled_perf_events = $facts['os_service_default'],
$device_detach_attempts = $facts['os_service_default'], $device_detach_attempts = $facts['os_service_default'],
$device_detach_timeout = $facts['os_service_default'], $device_detach_timeout = $facts['os_service_default'],
$libvirt_service_name = $::nova::params::libvirt_service_name, $libvirt_service_name = $nova::params::libvirt_service_name,
$virtlock_service_name = $::nova::params::virtlock_service_name, $virtlock_service_name = $nova::params::virtlock_service_name,
$virtlog_service_name = $::nova::params::virtlog_service_name, $virtlog_service_name = $nova::params::virtlog_service_name,
$compute_driver = 'libvirt.LibvirtDriver', $compute_driver = 'libvirt.LibvirtDriver',
$preallocate_images = $facts['os_service_default'], $preallocate_images = $facts['os_service_default'],
Boolean $manage_libvirt_services = true, Boolean $manage_libvirt_services = true,
@@ -338,12 +338,12 @@ class nova::compute::libvirt (
# - set nova::compute::libvirt::manage_libvirt_services to false # - set nova::compute::libvirt::manage_libvirt_services to false
# - include nova::compute::libvirt::services in your composition layer # - include nova::compute::libvirt::services in your composition layer
# - select which services you want to deploy with # - select which services you want to deploy with
# $::nova::compute::libvirt::services:* parameters. # $nova::compute::libvirt::services:* parameters.
# #
# If you're not using hiera: # If you're not using hiera:
# - set nova::compute::libvirt::manage_libvirt_services to true (default). # - set nova::compute::libvirt::manage_libvirt_services to true (default).
# - select which services you want to deploy with # - select which services you want to deploy with
# $::nova::compute::libvirt::*_service_name parameters. # $nova::compute::libvirt::*_service_name parameters.
if $manage_libvirt_services { if $manage_libvirt_services {
class { 'nova::compute::libvirt::services': class { 'nova::compute::libvirt::services':
libvirt_service_name => $libvirt_service_name, libvirt_service_name => $libvirt_service_name,
@@ -354,7 +354,7 @@ class nova::compute::libvirt (
} }
if defined('Class[nova::compute::rbd]') { if defined('Class[nova::compute::rbd]') {
if $::nova::compute::rbd::ephemeral_storage and $images_type != 'rbd' { if $nova::compute::rbd::ephemeral_storage and $images_type != 'rbd' {
fail('nova::compute::libvirt::images_type should be rbd if rbd ephemeral storage is used.') fail('nova::compute::libvirt::images_type should be rbd if rbd ephemeral storage is used.')
} }
} }

8
manifests/compute/libvirt/networks.pp
View File

@@ -20,16 +20,16 @@ class nova::compute::libvirt::networks(
path => ['/bin', '/usr/bin'], path => ['/bin', '/usr/bin'],
onlyif => [ onlyif => [
'virsh net-info default 2>/dev/null', 'virsh net-info default 2>/dev/null',
'virsh net-info default 2>/dev/null | grep -i "^autostart:\s*yes"' 'virsh net-info default 2>/dev/null | grep -i "^autostart:\s*yes"',
] ],
} }
exec { 'libvirt-default-net-destroy': exec { 'libvirt-default-net-destroy':
command => 'virsh net-destroy default', command => 'virsh net-destroy default',
path => ['/bin', '/usr/bin'], path => ['/bin', '/usr/bin'],
onlyif => [ onlyif => [
'virsh net-info default 2>/dev/null', 'virsh net-info default 2>/dev/null',
'virsh net-info default 2>/dev/null | grep -i "^active:\s*yes"' 'virsh net-info default 2>/dev/null | grep -i "^active:\s*yes"',
] ],
} }
Service<| tag == 'libvirt-service' |> Service<| tag == 'libvirt-service' |>

6
manifests/compute/libvirt/qemu.pp
View File

@@ -47,8 +47,8 @@
# #
# [*libvirt_version*] # [*libvirt_version*]
# (optional) installed libvirt version. Default is automatic detected depending # (optional) installed libvirt version. Default is automatic detected depending
# 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,
@@ -61,7 +61,7 @@ class nova::compute::libvirt::qemu(
Boolean $default_tls_verify = true, Boolean $default_tls_verify = true,
$memory_backing_dir = undef, $memory_backing_dir = undef,
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

4
manifests/compute/libvirt/secret_ceph.pp
View File

@@ -39,7 +39,7 @@ define nova::compute::libvirt::secret_ceph(
$xml_file = "${secret_path}/libvirt-secret-${uuid}.xml" $xml_file = "${secret_path}/libvirt-secret-${uuid}.xml"
file { $xml_file: file { $xml_file:
ensure => 'present', ensure => file,
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0600', mode => '0600',
@@ -52,7 +52,7 @@ define nova::compute::libvirt::secret_ceph(
$secret_file = "${secret_path}/libvirt-secret-${uuid}.secret" $secret_file = "${secret_path}/libvirt-secret-${uuid}.secret"
file { $secret_file: file { $secret_file:
ensure => 'present', ensure => file,
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0600', mode => '0600',

64
manifests/compute/libvirt/services.pp
View File

@@ -10,15 +10,15 @@
# #
# [*libvirt_service_name*] # [*libvirt_service_name*]
# (optional) libvirt service name. # (optional) libvirt service name.
# Defaults to $::nova::params::libvirt_service_name # Defaults to $nova::params::libvirt_service_name
# #
# [*virtlock_service_name*] # [*virtlock_service_name*]
# (optional) virtlock service name. # (optional) virtlock service name.
# Defaults to $::nova::params::virtlock_service_name # Defaults to $nova::params::virtlock_service_name
# #
# [*virtlog_service_name*] # [*virtlog_service_name*]
# (optional) virtlog service name. # (optional) virtlog service name.
# Defaults to $::nova::params::virtlog_service_name # Defaults to $nova::params::virtlog_service_name
# #
# [*libvirt_virt_type*] # [*libvirt_virt_type*]
# (optional) Libvirt domain type. Options are: kvm, lxc, qemu, parallels # (optional) Libvirt domain type. Options are: kvm, lxc, qemu, parallels
@@ -27,27 +27,27 @@
# [*modular_libvirt*] # [*modular_libvirt*]
# (optional) Whether to enable modular libvirt daemons or use monolithic # (optional) Whether to enable modular libvirt daemons or use monolithic
# libvirt daemon. # libvirt daemon.
# Defaults to $::nova::params::modular_libvirt # Defaults to $nova::params::modular_libvirt
# #
# [*virtsecret_service_name*] # [*virtsecret_service_name*]
# (optional) virtsecret service name. # (optional) virtsecret service name.
# Defaults to $::nova::params::virtsecret_socket_name # Defaults to $nova::params::virtsecret_socket_name
# #
# [*virtnodedev_service_name*] # [*virtnodedev_service_name*]
# (optional) virtnodedev service name. # (optional) virtnodedev service name.
# Defaults to $::nova::params::virtnodedevd_socket_name # Defaults to $nova::params::virtnodedevd_socket_name
# #
# [*virtqemu_service_name*] # [*virtqemu_service_name*]
# (optional) virtqemu service name. # (optional) virtqemu service name.
# Defaults to $::nova::params::virtqemu_socket_name # Defaults to $nova::params::virtqemu_socket_name
# #
# [*virtproxy_service_name*] # [*virtproxy_service_name*]
# (optional) virtproxy service name. # (optional) virtproxy service name.
# Defaults to $::nova::params::virtproxy_socket_name # Defaults to $nova::params::virtproxy_socket_name
# #
# [*virtstorage_service_name*] # [*virtstorage_service_name*]
# (optional) virtstorage service name. # (optional) virtstorage service name.
# Defaults to $::nova::params::virtstorage_socket_name # Defaults to $nova::params::virtstorage_socket_name
# #
# [*manage_ovmf*] # [*manage_ovmf*]
# (optional) install the OVMF package. # (optional) install the OVMF package.
@@ -59,16 +59,16 @@
# #
class nova::compute::libvirt::services ( class nova::compute::libvirt::services (
$ensure_package = 'present', $ensure_package = 'present',
$libvirt_service_name = $::nova::params::libvirt_service_name, $libvirt_service_name = $nova::params::libvirt_service_name,
$virtlock_service_name = $::nova::params::virtlock_service_name, $virtlock_service_name = $nova::params::virtlock_service_name,
$virtlog_service_name = $::nova::params::virtlog_service_name, $virtlog_service_name = $nova::params::virtlog_service_name,
$libvirt_virt_type = 'kvm', $libvirt_virt_type = 'kvm',
$modular_libvirt = $::nova::params::modular_libvirt, $modular_libvirt = $nova::params::modular_libvirt,
$virtsecret_service_name = $::nova::params::virtsecret_socket_name, $virtsecret_service_name = $nova::params::virtsecret_socket_name,
$virtnodedev_service_name = $::nova::params::virtnodedev_socket_name, $virtnodedev_service_name = $nova::params::virtnodedev_socket_name,
$virtqemu_service_name = $::nova::params::virtqemu_socket_name, $virtqemu_service_name = $nova::params::virtqemu_socket_name,
$virtproxy_service_name = $::nova::params::virtproxy_socket_name, $virtproxy_service_name = $nova::params::virtproxy_socket_name,
$virtstorage_service_name = $::nova::params::virtstorage_socket_name, $virtstorage_service_name = $nova::params::virtstorage_socket_name,
Boolean $manage_ovmf = true, Boolean $manage_ovmf = true,
Boolean $manage_swtpm = false, Boolean $manage_swtpm = false,
) inherits nova::params { ) inherits nova::params {
@@ -76,14 +76,14 @@ class nova::compute::libvirt::services (
include nova::deps include nova::deps
include nova::params include nova::params
if $modular_libvirt and !$::nova::params::modular_libvirt_support { if $modular_libvirt and !$nova::params::modular_libvirt_support {
fail('Modular libvirt daemons are not supported in this distribution') fail('Modular libvirt daemons are not supported in this distribution')
} }
if $manage_ovmf { if $manage_ovmf {
package { 'ovmf': package { 'ovmf':
ensure => $ensure_package, ensure => $ensure_package,
name => $::nova::params::ovmf_package_name, name => $nova::params::ovmf_package_name,
tag => ['openstack', 'nova-support-package'], tag => ['openstack', 'nova-support-package'],
} }
Package['ovmf'] ~> Service<| tag == 'libvirt-qemu-service' |> Package['ovmf'] ~> Service<| tag == 'libvirt-qemu-service' |>
@@ -93,7 +93,7 @@ class nova::compute::libvirt::services (
if $manage_swtpm { if $manage_swtpm {
package { 'swtpm': package { 'swtpm':
ensure => $ensure_package, ensure => $ensure_package,
name => $::nova::params::swtpm_package_name, name => $nova::params::swtpm_package_name,
tag => ['openstack', 'nova-support-package'], tag => ['openstack', 'nova-support-package'],
} }
} }
@@ -102,17 +102,17 @@ class nova::compute::libvirt::services (
if $facts['os']['family'] == 'RedHat' { if $facts['os']['family'] == 'RedHat' {
case $libvirt_virt_type { case $libvirt_virt_type {
'qemu': { 'qemu': {
$libvirt_package_name_real = "${::nova::params::libvirt_daemon_package_prefix}kvm" $libvirt_package_name_real = "${nova::params::libvirt_daemon_package_prefix}kvm"
} }
'parallels': { 'parallels': {
$libvirt_package_name_real = $::nova::params::libvirt_package_name $libvirt_package_name_real = $nova::params::libvirt_package_name
} }
default: { default: {
$libvirt_package_name_real = "${::nova::params::libvirt_daemon_package_prefix}${libvirt_virt_type}" $libvirt_package_name_real = "${nova::params::libvirt_daemon_package_prefix}${libvirt_virt_type}"
} }
} }
} else { } else {
$libvirt_package_name_real = $::nova::params::libvirt_package_name $libvirt_package_name_real = $nova::params::libvirt_package_name
} }
# libvirt # libvirt
@@ -135,7 +135,7 @@ class nova::compute::libvirt::services (
if $facts['os']['family'] == 'RedHat' { if $facts['os']['family'] == 'RedHat' {
package { 'libvirt-daemon': package { 'libvirt-daemon':
ensure => $ensure_package, ensure => $ensure_package,
name => $::nova::params::libvirt_daemon_package_name, name => $nova::params::libvirt_daemon_package_name,
tag => ['openstack', 'nova-support-package'], tag => ['openstack', 'nova-support-package'],
} }
Package['libvirt-daemon'] ~> Service<| title == 'libvirt' |> Package['libvirt-daemon'] ~> Service<| title == 'libvirt' |>
@@ -152,10 +152,10 @@ class nova::compute::libvirt::services (
} }
if $virtlock_service_name { if $virtlock_service_name {
if $::nova::params::virtlock_package_name { if $nova::params::virtlock_package_name {
package { 'virtlockd': package { 'virtlockd':
ensure => present, ensure => present,
name => $::nova::params::virtlock_package_name, name => $nova::params::virtlock_package_name,
tag => ['openstack', 'nova-support-package'], tag => ['openstack', 'nova-support-package'],
} }
Package['virtlockd'] ~> Service['virtlockd'] Package['virtlockd'] ~> Service['virtlockd']
@@ -194,7 +194,7 @@ class nova::compute::libvirt::services (
if $virtsecret_service_name { if $virtsecret_service_name {
package { 'virtsecret': package { 'virtsecret':
ensure => $ensure_package, ensure => $ensure_package,
name => "${::nova::params::libvirt_daemon_package_prefix}driver-secret", name => "${nova::params::libvirt_daemon_package_prefix}driver-secret",
tag => ['openstack', 'nova-support-package'], tag => ['openstack', 'nova-support-package'],
} }
service { 'virtsecretd': service { 'virtsecretd':
@@ -224,7 +224,7 @@ class nova::compute::libvirt::services (
if $virtnodedev_service_name { if $virtnodedev_service_name {
package { 'virtnodedev': package { 'virtnodedev':
ensure => $ensure_package, ensure => $ensure_package,
name => "${::nova::params::libvirt_daemon_package_prefix}driver-nodedev", name => "${nova::params::libvirt_daemon_package_prefix}driver-nodedev",
tag => ['openstack', 'nova-support-package'], tag => ['openstack', 'nova-support-package'],
} }
service { 'virtnodedevd': service { 'virtnodedevd':
@@ -255,7 +255,7 @@ class nova::compute::libvirt::services (
if $virtqemu_service_name { if $virtqemu_service_name {
package { 'virtqemu': package { 'virtqemu':
ensure => $ensure_package, ensure => $ensure_package,
name => "${::nova::params::libvirt_daemon_package_prefix}driver-qemu", name => "${nova::params::libvirt_daemon_package_prefix}driver-qemu",
tag => ['openstack', 'nova-support-package'], tag => ['openstack', 'nova-support-package'],
} }
service { 'virtqemud': service { 'virtqemud':
@@ -308,7 +308,7 @@ class nova::compute::libvirt::services (
if $virtstorage_service_name { if $virtstorage_service_name {
package { 'virtstorage': package { 'virtstorage':
ensure => $ensure_package, ensure => $ensure_package,
name => "${::nova::params::libvirt_daemon_package_prefix}driver-storage", name => "${nova::params::libvirt_daemon_package_prefix}driver-storage",
tag => ['openstack', 'nova-support-package'], tag => ['openstack', 'nova-support-package'],
} }
service { 'virtstoraged': service { 'virtstoraged':

36
manifests/compute/libvirt_guests.pp
View File

@@ -88,20 +88,20 @@ class nova::compute::libvirt_guests (
-> Anchor['nova::config::end'] -> Anchor['nova::config::end']
# NOTE(tkajinam): The environment file is not present in CentOS/RHEL # NOTE(tkajinam): The environment file is not present in CentOS/RHEL
file { $::nova::params::libvirt_guests_environment_file: file { $nova::params::libvirt_guests_environment_file:
ensure => present, ensure => file,
path => $::nova::params::libvirt_guests_environment_file, path => $nova::params::libvirt_guests_environment_file,
tag => 'libvirt-guests-file', tag => 'libvirt-guests-file',
} }
file_line { 'libvirt-guests ON_BOOT': file_line { 'libvirt-guests ON_BOOT':
path => $::nova::params::libvirt_guests_environment_file, path => $nova::params::libvirt_guests_environment_file,
line => "ON_BOOT=${on_boot}", line => "ON_BOOT=${on_boot}",
match => '^ON_BOOT=.*', match => '^ON_BOOT=.*',
tag => 'libvirt-guests-file_line', tag => 'libvirt-guests-file_line',
} }
file_line { 'libvirt-guests ON_SHUTDOWN': file_line { 'libvirt-guests ON_SHUTDOWN':
path => $::nova::params::libvirt_guests_environment_file, path => $nova::params::libvirt_guests_environment_file,
line => "ON_SHUTDOWN=${on_shutdown}", line => "ON_SHUTDOWN=${on_shutdown}",
match => '^ON_SHUTDOWN=.*', match => '^ON_SHUTDOWN=.*',
tag => 'libvirt-guests-file_line', tag => 'libvirt-guests-file_line',
@@ -109,7 +109,7 @@ class nova::compute::libvirt_guests (
if $start_delay { if $start_delay {
file_line { 'libvirt-guests START_DELAY': file_line { 'libvirt-guests START_DELAY':
path => $::nova::params::libvirt_guests_environment_file, path => $nova::params::libvirt_guests_environment_file,
line => "START_DELAY=${start_delay}", line => "START_DELAY=${start_delay}",
match => '^START_DELAY=.*', match => '^START_DELAY=.*',
tag => 'libvirt-guests-file_line', tag => 'libvirt-guests-file_line',
@@ -117,7 +117,7 @@ class nova::compute::libvirt_guests (
} else { } else {
file_line { 'libvirt-guests START_DELAY': file_line { 'libvirt-guests START_DELAY':
ensure => absent, ensure => absent,
path => $::nova::params::libvirt_guests_environment_file, path => $nova::params::libvirt_guests_environment_file,
match => '^START_DELAY=.*', match => '^START_DELAY=.*',
match_for_absence => true, match_for_absence => true,
tag => 'libvirt-guests-file_line', tag => 'libvirt-guests-file_line',
@@ -126,7 +126,7 @@ class nova::compute::libvirt_guests (
if $parallel_shutdown { if $parallel_shutdown {
file_line { 'libvirt-guests PARALLEL_SHUTDOWN': file_line { 'libvirt-guests PARALLEL_SHUTDOWN':
path => $::nova::params::libvirt_guests_environment_file, path => $nova::params::libvirt_guests_environment_file,
line => "PARALLEL_SHUTDOWN=${parallel_shutdown}", line => "PARALLEL_SHUTDOWN=${parallel_shutdown}",
match => '^PARALLEL_SHUTDOWN=.*', match => '^PARALLEL_SHUTDOWN=.*',
tag => 'libvirt-guests-file_line', tag => 'libvirt-guests-file_line',
@@ -134,7 +134,7 @@ class nova::compute::libvirt_guests (
} else { } else {
file_line { 'libvirt-guests PARALLEL_SHUTDOWN': file_line { 'libvirt-guests PARALLEL_SHUTDOWN':
ensure => absent, ensure => absent,
path => $::nova::params::libvirt_guests_environment_file, path => $nova::params::libvirt_guests_environment_file,
match => '^PARALLEL_SHUTDOWN=.*', match => '^PARALLEL_SHUTDOWN=.*',
match_for_absence => true, match_for_absence => true,
tag => 'libvirt-guests-file_line', tag => 'libvirt-guests-file_line',
@@ -143,7 +143,7 @@ class nova::compute::libvirt_guests (
if $shutdown_timeout { if $shutdown_timeout {
file_line { 'libvirt-guests SHUTDOWN_TIMEOUT': file_line { 'libvirt-guests SHUTDOWN_TIMEOUT':
path => $::nova::params::libvirt_guests_environment_file, path => $nova::params::libvirt_guests_environment_file,
line => "SHUTDOWN_TIMEOUT=${shutdown_timeout}", line => "SHUTDOWN_TIMEOUT=${shutdown_timeout}",
match => '^SHUTDOWN_TIMEOUT=.*', match => '^SHUTDOWN_TIMEOUT=.*',
tag => 'libvirt-guests-file_line', tag => 'libvirt-guests-file_line',
@@ -151,7 +151,7 @@ class nova::compute::libvirt_guests (
} else { } else {
file_line { 'libvirt-guests SHUTDOWN_TIMEOUT': file_line { 'libvirt-guests SHUTDOWN_TIMEOUT':
ensure => absent, ensure => absent,
path => $::nova::params::libvirt_guests_environment_file, path => $nova::params::libvirt_guests_environment_file,
match => '^SHUTDOWN_TIMEOUT=.*', match => '^SHUTDOWN_TIMEOUT=.*',
match_for_absence => true, match_for_absence => true,
tag => 'libvirt-guests-file_line', tag => 'libvirt-guests-file_line',
@@ -160,7 +160,7 @@ class nova::compute::libvirt_guests (
if $bypass_cache { if $bypass_cache {
file_line { 'libvirt-guests BYPASS_CACHE': file_line { 'libvirt-guests BYPASS_CACHE':
path => $::nova::params::libvirt_guests_environment_file, path => $nova::params::libvirt_guests_environment_file,
line => 'BYPASS_CACHE=1', line => 'BYPASS_CACHE=1',
match => '^BYPASS_CACHE=.*', match => '^BYPASS_CACHE=.*',
tag => 'libvirt-guests-file_line', tag => 'libvirt-guests-file_line',
@@ -168,7 +168,7 @@ class nova::compute::libvirt_guests (
} else { } else {
file_line { 'libvirt-guests BYPASS_CACHE': file_line { 'libvirt-guests BYPASS_CACHE':
ensure => absent, ensure => absent,
path => $::nova::params::libvirt_guests_environment_file, path => $nova::params::libvirt_guests_environment_file,
match => '^BYPASS_CACHE=.*', match => '^BYPASS_CACHE=.*',
match_for_absence => true, match_for_absence => true,
tag => 'libvirt-guests-file_line', tag => 'libvirt-guests-file_line',
@@ -177,7 +177,7 @@ class nova::compute::libvirt_guests (
if $sync_time { if $sync_time {
file_line { 'libvirt-guests SYNC_TIME': file_line { 'libvirt-guests SYNC_TIME':
path => $::nova::params::libvirt_guests_environment_file, path => $nova::params::libvirt_guests_environment_file,
line => 'SYNC_TIME=1', line => 'SYNC_TIME=1',
match => '^SYNC_TIME=.*', match => '^SYNC_TIME=.*',
tag => 'libvirt-guests-file_line', tag => 'libvirt-guests-file_line',
@@ -185,7 +185,7 @@ class nova::compute::libvirt_guests (
} else { } else {
file_line { 'libvirt-guests SYNC_TIME': file_line { 'libvirt-guests SYNC_TIME':
ensure => absent, ensure => absent,
path => $::nova::params::libvirt_guests_environment_file, path => $nova::params::libvirt_guests_environment_file,
match => '^SYNC_TIME=.*', match => '^SYNC_TIME=.*',
match_for_absence => true, match_for_absence => true,
tag => 'libvirt-guests-file_line', tag => 'libvirt-guests-file_line',
@@ -194,7 +194,7 @@ class nova::compute::libvirt_guests (
package { 'libvirt-client': package { 'libvirt-client':
ensure => $package_ensure, ensure => $package_ensure,
name => $::nova::params::libvirt_client_package_name, name => $nova::params::libvirt_client_package_name,
tag => ['openstack', 'nova-support-package'], tag => ['openstack', 'nova-support-package'],
} }
@@ -211,10 +211,10 @@ class nova::compute::libvirt_guests (
# this node are shut off if the service is restarted. # this node are shut off if the service is restarted.
service { 'libvirt-guests': service { 'libvirt-guests':
ensure => $service_ensure, ensure => $service_ensure,
name => $::nova::params::libvirt_guests_service_name, name => $nova::params::libvirt_guests_service_name,
enable => $enabled, enable => $enabled,
require => Anchor['nova::service::begin'], require => Anchor['nova::service::begin'],
notify => Anchor['nova::service::end'] notify => Anchor['nova::service::end'],
} }
} }
} }

2
manifests/compute/mdev.pp
View File

@@ -15,7 +15,7 @@ class nova::compute::mdev(
if !empty($mdev_types) { if !empty($mdev_types) {
nova_config { nova_config {
'devices/enabled_mdev_types': value => join(keys($mdev_types), ',') 'devices/enabled_mdev_types': value => join(keys($mdev_types), ',');
} }
create_resources('nova::compute::mdev_type', $mdev_types) create_resources('nova::compute::mdev_type', $mdev_types)
} else { } else {

8
manifests/compute/provider.pp
View File

@@ -83,8 +83,8 @@ class nova::compute::provider (
file { "${config_location}": file { "${config_location}":
ensure => directory, ensure => directory,
mode => '0750', mode => '0750',
owner => $::nova::params::user, owner => $nova::params::user,
group => $::nova::params::group, group => $nova::params::group,
require => Anchor['nova::config::begin'], require => Anchor['nova::config::begin'],
before => Anchor['nova::config::end'], before => Anchor['nova::config::end'],
} }
@@ -93,8 +93,8 @@ class nova::compute::provider (
file { "${config_location}/${config_file}": file { "${config_location}/${config_file}":
ensure => file, ensure => file,
mode => '0640', mode => '0640',
owner => $::nova::params::user, owner => $nova::params::user,
group => $::nova::params::group, group => $nova::params::group,
content => template('nova/provider.yaml.erb'), content => template('nova/provider.yaml.erb'),
require => Anchor['nova::config::begin'], require => Anchor['nova::config::begin'],
notify => Anchor['nova::config::end'], notify => Anchor['nova::config::end'],

2
manifests/compute/rbd.pp
View File

@@ -171,7 +171,7 @@ class nova::compute::rbd (
if $ephemeral_storage { if $ephemeral_storage {
if defined('Class[nova::compute::libvirt]') { if defined('Class[nova::compute::libvirt]') {
if $::nova::compute::libvirt::images_type != 'rbd' { if $nova::compute::libvirt::images_type != 'rbd' {
fail('nova::compute::libvirt::images_type should be rbd if rbd ephemeral storage is used.') fail('nova::compute::libvirt::images_type should be rbd if rbd ephemeral storage is used.')
} }
} }

6
manifests/conductor.pp
View File

@@ -43,13 +43,13 @@ class nova::conductor(
nova::generic_service { 'conductor': nova::generic_service { 'conductor':
enabled => $enabled, enabled => $enabled,
manage_service => $manage_service, manage_service => $manage_service,
package_name => $::nova::params::conductor_package_name, package_name => $nova::params::conductor_package_name,
service_name => $::nova::params::conductor_service_name, service_name => $nova::params::conductor_service_name,
ensure_package => $ensure_package, ensure_package => $ensure_package,
} }
nova_config { nova_config {
'conductor/workers': value => $workers; 'conductor/workers': value => $workers;
'DEFAULT/enable_new_services': value => $enable_new_services 'DEFAULT/enable_new_services': value => $enable_new_services;
} }
} }

6
manifests/cron/archive_deleted_rows.pp
View File

@@ -43,7 +43,7 @@
# #
# [*user*] # [*user*]
# (optional) User with access to nova files. # (optional) User with access to nova files.
# Defaults to $::nova::params::user. # Defaults to $nova::params::user.
# #
# [*destination*] # [*destination*]
# (optional) Path to file to which rows should be archived # (optional) Path to file to which rows should be archived
@@ -99,7 +99,7 @@ class nova::cron::archive_deleted_rows (
$month = '*', $month = '*',
$weekday = '*', $weekday = '*',
$max_rows = '100', $max_rows = '100',
$user = $::nova::params::user, $user = $nova::params::user,
$destination = '/var/log/nova/nova-rowsflush.log', $destination = '/var/log/nova/nova-rowsflush.log',
Boolean $until_complete = false, Boolean $until_complete = false,
Boolean $purge = false, Boolean $purge = false,
@@ -181,6 +181,6 @@ class nova::cron::archive_deleted_rows (
monthday => $monthday, monthday => $monthday,
month => $month, month => $month,
weekday => $weekday, weekday => $weekday,
require => Anchor['nova::dbsync::end'] require => Anchor['nova::dbsync::end'],
} }
} }

6
manifests/cron/purge_shadow_tables.pp
View File

@@ -36,7 +36,7 @@
# #
# [*user*] # [*user*]
# (optional) User with access to nova files. # (optional) User with access to nova files.
# Defaults to $::nova::params::user. # Defaults to $nova::params::user.
# #
# [*destination*] # [*destination*]
# (optional) Path to file to which rows should be archived # (optional) Path to file to which rows should be archived
@@ -71,7 +71,7 @@ class nova::cron::purge_shadow_tables (
$monthday = '*', $monthday = '*',
$month = '*', $month = '*',
$weekday = '*', $weekday = '*',
$user = $::nova::params::user, $user = $nova::params::user,
$destination = '/var/log/nova/nova-rowspurge.log', $destination = '/var/log/nova/nova-rowspurge.log',
$age = 14, $age = 14,
Boolean $all_cells = false, Boolean $all_cells = false,
@@ -117,6 +117,6 @@ class nova::cron::purge_shadow_tables (
monthday => $monthday, monthday => $monthday,
month => $month, month => $month,
weekday => $weekday, weekday => $weekday,
require => Anchor['nova::dbsync::end'] require => Anchor['nova::dbsync::end'],
} }
} }

2
manifests/db/online_data_migrations.pp
View File

@@ -23,7 +23,7 @@ class nova::db::online_data_migrations(
exec { 'nova-db-online-data-migrations': exec { 'nova-db-online-data-migrations':
command => "/usr/bin/nova-manage ${extra_params} db online_data_migrations", command => "/usr/bin/nova-manage ${extra_params} db online_data_migrations",
user => $::nova::params::user, user => $nova::params::user,
refreshonly => true, refreshonly => true,
try_sleep => 5, try_sleep => 5,
tries => 10, tries => 10,

2
manifests/db/sync.pp
View File

@@ -23,7 +23,7 @@ class nova::db::sync(
exec { 'nova-db-sync': exec { 'nova-db-sync':
command => "/usr/bin/nova-manage ${extra_params} db sync", command => "/usr/bin/nova-manage ${extra_params} db sync",
user => $::nova::params::user, user => $nova::params::user,
refreshonly => true, refreshonly => true,
try_sleep => 5, try_sleep => 5,
tries => 10, tries => 10,

2
manifests/db/sync_api.pp
View File

@@ -32,7 +32,7 @@ class nova::db::sync_api(
exec { 'nova-db-sync-api': exec { 'nova-db-sync-api':
command => "/usr/bin/nova-manage ${extra_params} api_db sync", command => "/usr/bin/nova-manage ${extra_params} api_db sync",
user => $::nova::params::user, user => $nova::params::user,
refreshonly => true, refreshonly => true,
try_sleep => 5, try_sleep => 5,
tries => 10, tries => 10,

22
manifests/init.pp
View File

@@ -169,7 +169,7 @@
# [*lock_path*] # [*lock_path*]
# (optional) Directory for lock files. # (optional) Directory for lock files.
# On RHEL will be '/var/lib/nova/tmp' and on Debian '/var/lock/nova' # On RHEL will be '/var/lib/nova/tmp' and on Debian '/var/lock/nova'
# Defaults to $::nova::params::lock_path # Defaults to $nova::params::lock_path
# #
# [*report_interval*] # [*report_interval*]
# (optional) Interval at which nodes report to data store. # (optional) Interval at which nodes report to data store.
@@ -401,7 +401,7 @@ class nova(
$host = $facts['os_service_default'], $host = $facts['os_service_default'],
$service_down_time = $facts['os_service_default'], $service_down_time = $facts['os_service_default'],
$state_path = '/var/lib/nova', $state_path = '/var/lib/nova',
$lock_path = $::nova::params::lock_path, $lock_path = $nova::params::lock_path,
$report_interval = $facts['os_service_default'], $report_interval = $facts['os_service_default'],
$periodic_fuzzy_delay = $facts['os_service_default'], $periodic_fuzzy_delay = $facts['os_service_default'],
$rootwrap_config = '/etc/nova/rootwrap.conf', $rootwrap_config = '/etc/nova/rootwrap.conf',
@@ -449,7 +449,7 @@ class nova(
include nova::workarounds include nova::workarounds
[ [
'use_ssl', 'enabled_ssl_apis', 'ca_file', 'cert_file', 'key_file' 'use_ssl', 'enabled_ssl_apis', 'ca_file', 'cert_file', 'key_file',
].each |String $opt| { ].each |String $opt| {
if getvar($opt) != undef { if getvar($opt) != undef {
warning("The ${opt} parameter is deprecated and has no effect.") warning("The ${opt} parameter is deprecated and has no effect.")
@@ -461,8 +461,8 @@ class nova(
file { '/var/lib/nova/.ssh': file { '/var/lib/nova/.ssh':
ensure => directory, ensure => directory,
mode => '0700', mode => '0700',
owner => $::nova::params::user, owner => $nova::params::user,
group => $::nova::params::group, group => $nova::params::group,
require => Anchor['nova::config::begin'], require => Anchor['nova::config::begin'],
before => Anchor['nova::config::end'], before => Anchor['nova::config::end'],
} }
@@ -472,7 +472,7 @@ class nova(
ensure => present, ensure => present,
key => $nova_public_key['key'], key => $nova_public_key['key'],
type => $nova_public_key['type'], type => $nova_public_key['type'],
user => $::nova::params::user, user => $nova::params::user,
require => File['/var/lib/nova/.ssh'], require => File['/var/lib/nova/.ssh'],
} }
} }
@@ -483,8 +483,8 @@ class nova(
file { "/var/lib/nova/.ssh/${nova_private_key_file}": file { "/var/lib/nova/.ssh/${nova_private_key_file}":
content => $nova_private_key['key'], content => $nova_private_key['key'],
mode => '0600', mode => '0600',
owner => $::nova::params::user, owner => $nova::params::user,
group => $::nova::params::group, group => $nova::params::group,
show_diff => false, show_diff => false,
require => File['/var/lib/nova/.ssh'], require => File['/var/lib/nova/.ssh'],
} }
@@ -493,13 +493,13 @@ class nova(
package { 'python-nova': package { 'python-nova':
ensure => $ensure_package, ensure => $ensure_package,
name => $::nova::params::python_package_name, name => $nova::params::python_package_name,
tag => ['openstack', 'nova-package'], tag => ['openstack', 'nova-package'],
} }
package { 'nova-common': package { 'nova-common':
ensure => $ensure_package, ensure => $ensure_package,
name => $::nova::params::common_package_name, name => $nova::params::common_package_name,
require => Package['python-nova'], require => Package['python-nova'],
tag => ['openstack', 'nova-package'], tag => ['openstack', 'nova-package'],
} }
@@ -512,7 +512,7 @@ class nova(
warning('The auth_strategy parameter is deprecated, and will be removed in a future release.') warning('The auth_strategy parameter is deprecated, and will be removed in a future release.')
} }
nova_config { nova_config {
'api/auth_strategy': value => pick($auth_strategy, $facts['os_service_default']) 'api/auth_strategy': value => pick($auth_strategy, $facts['os_service_default']);
} }
nova_config { nova_config {

14
manifests/migration/libvirt.pp
View File

@@ -149,13 +149,13 @@
# #
# [*libvirt_version*] # [*libvirt_version*]
# (optional) installed libvirt version. Default is automatic detected depending # (optional) installed libvirt version. Default is automatic detected depending
# 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
# #
# [*modular_libvirt*] # [*modular_libvirt*]
# (optional) Whether to enable modular libvirt daemons or use monolithic # (optional) Whether to enable modular libvirt daemons or use monolithic
# libvirt daemon. # libvirt daemon.
# Defaults to $::nova::params::modular_libvirt # Defaults to $nova::params::modular_libvirt
# #
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
# #
@@ -198,7 +198,7 @@ class nova::migration::libvirt(
$ca_file = $facts['os_service_default'], $ca_file = $facts['os_service_default'],
$crl_file = $facts['os_service_default'], $crl_file = $facts['os_service_default'],
$libvirt_version = undef, $libvirt_version = undef,
Boolean $modular_libvirt = $::nova::params::modular_libvirt, Boolean $modular_libvirt = $nova::params::modular_libvirt,
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$live_migration_tunnelled = undef, $live_migration_tunnelled = undef,
) inherits nova::params { ) inherits nova::params {
@@ -209,12 +209,12 @@ class nova::migration::libvirt(
warning('The live_migration_tunnelled parameter has been deprecated.') warning('The live_migration_tunnelled parameter has been deprecated.')
} }
if $modular_libvirt and !$::nova::params::modular_libvirt_support { if $modular_libvirt and !$nova::params::modular_libvirt_support {
fail('Modular libvirt daemons are not supported in this distribution') fail('Modular libvirt daemons are not supported in this distribution')
} }
include nova::compute::libvirt::version include nova::compute::libvirt::version
$libvirt_version_real = pick($libvirt_version, $::nova::compute::libvirt::version::default) $libvirt_version_real = pick($libvirt_version, $nova::compute::libvirt::version::default)
if $configure_nova { if $configure_nova {
if $transport == 'ssh' and ($client_user or $client_port or !empty($client_extraparams)) { if $transport == 'ssh' and ($client_user or $client_port or !empty($client_extraparams)) {
@@ -382,7 +382,7 @@ class nova::migration::libvirt(
if is_service_default($listen_address) { if is_service_default($listen_address) {
file { "/etc/systemd/system/${socket_name}.socket": file { "/etc/systemd/system/${socket_name}.socket":
ensure => absent, ensure => absent,
require => Anchor['nova::install::end'] require => Anchor['nova::install::end'],
} ~> exec { 'libvirt-socket-daemon-reload': } ~> exec { 'libvirt-socket-daemon-reload':
command => 'systemctl daemon-reload', command => 'systemctl daemon-reload',
path => ['/sbin', '/usr/sbin', '/bin', '/usr/bin'], path => ['/sbin', '/usr/sbin', '/bin', '/usr/bin'],

2
manifests/policy.pp
View File

@@ -62,7 +62,7 @@ class nova::policy (
policies => $policies, policies => $policies,
policy_path => $policy_path, policy_path => $policy_path,
file_user => 'root', file_user => 'root',
file_group => $::nova::params::group, file_group => $nova::params::group,
file_format => 'yaml', file_format => 'yaml',
purge_config => $purge_config, purge_config => $purge_config,
tag => 'nova', tag => 'nova',

4
manifests/scheduler.pp
View File

@@ -89,8 +89,8 @@ class nova::scheduler(
nova::generic_service { 'scheduler': nova::generic_service { 'scheduler':
enabled => $enabled, enabled => $enabled,
manage_service => $manage_service, manage_service => $manage_service,
package_name => $::nova::params::scheduler_package_name, package_name => $nova::params::scheduler_package_name,
service_name => $::nova::params::scheduler_service_name, service_name => $nova::params::scheduler_service_name,
ensure_package => $ensure_package, ensure_package => $ensure_package,
} }

6
manifests/serialproxy.pp
View File

@@ -43,9 +43,9 @@ class nova::serialproxy(
nova::generic_service { 'serialproxy': nova::generic_service { 'serialproxy':
enabled => $enabled, enabled => $enabled,
manage_service => $manage_service, manage_service => $manage_service,
package_name => $::nova::params::serialproxy_package_name, package_name => $nova::params::serialproxy_package_name,
service_name => $::nova::params::serialproxy_service_name, service_name => $nova::params::serialproxy_service_name,
ensure_package => $ensure_package ensure_package => $ensure_package,
} }
} }

4
manifests/spicehtml5proxy.pp
View File

@@ -71,8 +71,8 @@ class nova::spicehtml5proxy(
nova::generic_service { 'spicehtml5proxy': nova::generic_service { 'spicehtml5proxy':
enabled => $enabled, enabled => $enabled,
manage_service => $manage_service, manage_service => $manage_service,
package_name => $::nova::params::spicehtml5proxy_package_name, package_name => $nova::params::spicehtml5proxy_package_name,
service_name => $::nova::params::spicehtml5proxy_service_name, service_name => $nova::params::spicehtml5proxy_service_name,
ensure_package => $ensure_package, ensure_package => $ensure_package,
} }
} }

4
manifests/vncproxy.pp
View File

@@ -140,8 +140,8 @@ class nova::vncproxy(
nova::generic_service { 'vncproxy': nova::generic_service { 'vncproxy':
enabled => $enabled, enabled => $enabled,
manage_service => $manage_service, manage_service => $manage_service,
package_name => $::nova::params::vncproxy_package_name, package_name => $nova::params::vncproxy_package_name,
service_name => $::nova::params::vncproxy_service_name, service_name => $nova::params::vncproxy_service_name,
ensure_package => $ensure_package, ensure_package => $ensure_package,
} }

32
manifests/vncproxy/common.pp
View File

@@ -25,14 +25,14 @@ class nova::vncproxy::common (
include nova::deps include nova::deps
if defined('$::nova::compute::vncproxy_host') { if defined('$nova::compute::vncproxy_host') {
$compute_vncproxy_host_real = $::nova::compute::vncproxy_host $compute_vncproxy_host_real = $nova::compute::vncproxy_host
} else { } else {
$compute_vncproxy_host_real = undef $compute_vncproxy_host_real = undef
} }
if defined('$::nova::vncproxy::host') { if defined('$nova::vncproxy::host') {
$compat_vncproxy_host_real = $::nova::vncproxy::host $compat_vncproxy_host_real = $nova::vncproxy::host
} else { } else {
$compat_vncproxy_host_real = undef $compat_vncproxy_host_real = undef
} }
@@ -43,14 +43,14 @@ class nova::vncproxy::common (
$compat_vncproxy_host_real, $compat_vncproxy_host_real,
false)) false))
if defined('$::nova::compute::vncproxy_protocol') { if defined('$nova::compute::vncproxy_protocol') {
$compute_vncproxy_protocol_real = $::nova::compute::vncproxy_protocol $compute_vncproxy_protocol_real = $nova::compute::vncproxy_protocol
} else { } else {
$compute_vncproxy_protocol_real = undef $compute_vncproxy_protocol_real = undef
} }
if defined('$::nova::vncproxy::vncproxy_protocol') { if defined('$nova::vncproxy::vncproxy_protocol') {
$compat_vncproxy_protocol_real = $::nova::vncproxy::vncproxy_protocol $compat_vncproxy_protocol_real = $nova::vncproxy::vncproxy_protocol
} else { } else {
$compat_vncproxy_protocol_real = undef $compat_vncproxy_protocol_real = undef
} }
@@ -61,14 +61,14 @@ class nova::vncproxy::common (
$compat_vncproxy_protocol_real, $compat_vncproxy_protocol_real,
'http') 'http')
if defined('$::nova::compute::vncproxy_port') { if defined('$nova::compute::vncproxy_port') {
$compute_vncproxy_port_real = $::nova::compute::vncproxy_port $compute_vncproxy_port_real = $nova::compute::vncproxy_port
} else { } else {
$compute_vncproxy_port_real = undef $compute_vncproxy_port_real = undef
} }
if defined('$::nova::vncproxy::port') { if defined('$nova::vncproxy::port') {
$compat_vncproxy_port_real = $::nova::vncproxy::port $compat_vncproxy_port_real = $nova::vncproxy::port
} else { } else {
$compat_vncproxy_port_real = undef $compat_vncproxy_port_real = undef
} }
@@ -79,14 +79,14 @@ class nova::vncproxy::common (
$compat_vncproxy_port_real, $compat_vncproxy_port_real,
6080) 6080)
if defined('$::nova::compute::vncproxy_path') { if defined('$nova::compute::vncproxy_path') {
$compute_vncproxy_path_real = $::nova::compute::vncproxy_path $compute_vncproxy_path_real = $nova::compute::vncproxy_path
} else { } else {
$compute_vncproxy_path_real = undef $compute_vncproxy_path_real = undef
} }
if defined('$::nova::vncproxy::vncproxy_path') { if defined('$nova::vncproxy::vncproxy_path') {
$compat_vncproxy_path_real = $::nova::vncproxy::vncproxy_path $compat_vncproxy_path_real = $nova::vncproxy::vncproxy_path
} else { } else {
$compat_vncproxy_path_real = undef $compat_vncproxy_path_real = undef
} }

8
manifests/wsgi/apache_api.pp
View File

@@ -176,7 +176,7 @@ class nova::wsgi::apache_api (
openstacklib::wsgi::apache { 'nova_api_wsgi': openstacklib::wsgi::apache { 'nova_api_wsgi':
bind_host => $bind_host, bind_host => $bind_host,
bind_port => $port, bind_port => $port,
group => $::nova::params::group, group => $nova::params::group,
path => $path, path => $path,
priority => $priority, priority => $priority,
servername => $servername, servername => $servername,
@@ -189,15 +189,15 @@ class nova::wsgi::apache_api (
ssl_crl_path => $ssl_crl_path, ssl_crl_path => $ssl_crl_path,
ssl_key => $ssl_key, ssl_key => $ssl_key,
threads => $threads, threads => $threads,
user => $::nova::params::user, user => $nova::params::user,
vhost_custom_fragment => $vhost_custom_fragment, vhost_custom_fragment => $vhost_custom_fragment,
workers => $workers, workers => $workers,
wsgi_daemon_process => 'nova-api', wsgi_daemon_process => 'nova-api',
wsgi_process_display_name => $wsgi_process_display_name, wsgi_process_display_name => $wsgi_process_display_name,
wsgi_process_group => 'nova-api', wsgi_process_group => 'nova-api',
wsgi_script_dir => $::nova::params::nova_wsgi_script_path, wsgi_script_dir => $nova::params::nova_wsgi_script_path,
wsgi_script_file => 'nova-api', wsgi_script_file => 'nova-api',
wsgi_script_source => $::nova::params::nova_api_wsgi_script_source, wsgi_script_source => $nova::params::nova_api_wsgi_script_source,
headers => $headers, headers => $headers,
request_headers => $request_headers, request_headers => $request_headers,
custom_wsgi_process_options => $custom_wsgi_process_options, custom_wsgi_process_options => $custom_wsgi_process_options,

10
manifests/wsgi/apache_metadata.pp
View File

@@ -176,7 +176,7 @@ class nova::wsgi::apache_metadata (
nova::generic_service { 'metadata-api': nova::generic_service { 'metadata-api':
service_name => false, service_name => false,
package_name => $::nova::params::api_package_name, package_name => $nova::params::api_package_name,
ensure_package => $ensure_package, ensure_package => $ensure_package,
} }
@@ -189,7 +189,7 @@ class nova::wsgi::apache_metadata (
openstacklib::wsgi::apache { 'nova_metadata_wsgi': openstacklib::wsgi::apache { 'nova_metadata_wsgi':
bind_host => $bind_host, bind_host => $bind_host,
bind_port => $port, bind_port => $port,
group => $::nova::params::group, group => $nova::params::group,
path => $path, path => $path,
priority => $priority, priority => $priority,
servername => $servername, servername => $servername,
@@ -202,15 +202,15 @@ class nova::wsgi::apache_metadata (
ssl_crl_path => $ssl_crl_path, ssl_crl_path => $ssl_crl_path,
ssl_key => $ssl_key, ssl_key => $ssl_key,
threads => $threads, threads => $threads,
user => $::nova::params::user, user => $nova::params::user,
vhost_custom_fragment => $vhost_custom_fragment, vhost_custom_fragment => $vhost_custom_fragment,
workers => $workers, workers => $workers,
wsgi_daemon_process => 'nova-metadata', wsgi_daemon_process => 'nova-metadata',
wsgi_process_display_name => $wsgi_process_display_name, wsgi_process_display_name => $wsgi_process_display_name,
wsgi_process_group => 'nova-metadata', wsgi_process_group => 'nova-metadata',
wsgi_script_dir => $::nova::params::nova_wsgi_script_path, wsgi_script_dir => $nova::params::nova_wsgi_script_path,
wsgi_script_file => 'nova-metadata-api', wsgi_script_file => 'nova-metadata-api',
wsgi_script_source => $::nova::params::nova_metadata_wsgi_script_source, wsgi_script_source => $nova::params::nova_metadata_wsgi_script_source,
headers => $headers, headers => $headers,
request_headers => $request_headers, request_headers => $request_headers,
custom_wsgi_process_options => $custom_wsgi_process_options, custom_wsgi_process_options => $custom_wsgi_process_options,

4
spec/classes/nova_compute_libvirt_guests_spec.rb
View File

@@ -9,7 +9,7 @@ describe 'nova::compute::libvirt_guests' do
it { is_expected.to contain_class('nova::params')} it { is_expected.to contain_class('nova::params')}
it { is_expected.to contain_file(platform_params[:libvirt_guests_environment_file]).with( it { is_expected.to contain_file(platform_params[:libvirt_guests_environment_file]).with(
:ensure => 'present', :ensure => 'file',
:path => platform_params[:libvirt_guests_environment_file], :path => platform_params[:libvirt_guests_environment_file],
:tag => 'libvirt-guests-file' :tag => 'libvirt-guests-file'
)} )}
@@ -85,7 +85,7 @@ describe 'nova::compute::libvirt_guests' do
end end
it { is_expected.to contain_file(platform_params[:libvirt_guests_environment_file]).with( it { is_expected.to contain_file(platform_params[:libvirt_guests_environment_file]).with(
:ensure => 'present', :ensure => 'file',
:path => platform_params[:libvirt_guests_environment_file], :path => platform_params[:libvirt_guests_environment_file],
:tag => 'libvirt-guests-file' :tag => 'libvirt-guests-file'
)} )}

4
spec/defines/nova_compute_libvirt_secret_ceph_spec.rb
View File

@@ -21,7 +21,7 @@ describe 'nova::compute::libvirt::secret_ceph' do
end end
it { is_expected.to contain_file('/tmp/libvirt-secret-4f515eff-47e4-425c-b24d-9c6adc56401c.xml').with( it { is_expected.to contain_file('/tmp/libvirt-secret-4f515eff-47e4-425c-b24d-9c6adc56401c.xml').with(
:ensure => 'present', :ensure => 'file',
:owner => 'root', :owner => 'root',
:group => 'root', :group => 'root',
:mode => '0600', :mode => '0600',
@@ -40,7 +40,7 @@ describe 'nova::compute::libvirt::secret_ceph' do
} }
it { is_expected.to contain_file('/tmp/libvirt-secret-4f515eff-47e4-425c-b24d-9c6adc56401c.secret').with( it { is_expected.to contain_file('/tmp/libvirt-secret-4f515eff-47e4-425c-b24d-9c6adc56401c.secret').with(
:ensure => 'present', :ensure => 'file',
:owner => 'root', :owner => 'root',
:group => 'root', :group => 'root',
:mode => '0600', :mode => '0600',