openstack/puppet-nova
Code Issues Proposed changes

Merge "Replace redundant hard-code of [libvirt] inject_*"

Browse Source
This commit is contained in:
Zuul 2022-09-09 11:14:23 +00:00 committed by Gerrit Code Review
commit 52fa5d2327
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/compute/libvirt.pp
View File

@ -71,17 +71,17 @@
# #
# [*inject_password*] # [*inject_password*]
# (optional) Inject the admin password at boot time, without an agent. # (optional) Inject the admin password at boot time, without an agent.
# Defaults to false # Defaults to $::os_service_default
# #
# [*inject_key*] # [*inject_key*]
# (optional) Inject the ssh public key at boot time. # (optional) Inject the ssh public key at boot time.
# Defaults to false # Defaults to $::os_service_default
# #
# [*inject_partition*] # [*inject_partition*]
# (optional) The partition to inject to : -2 => disable, -1 => inspect # (optional) The partition to inject to : -2 => disable, -1 => inspect
# (libguestfs only), 0 => not partitioned, >0 => partition # (libguestfs only), 0 => not partitioned, >0 => partition
# number (integer value) # number (integer value)
# Defaults to -2 # Defaults to $::os_service_default
# #
# [*enabled_perf_events*] # [*enabled_perf_events*]
# (optional) This is a performance event list which could be used as monitor. # (optional) This is a performance event list which could be used as monitor.
@ -256,9 +256,9 @@ class nova::compute::libvirt (
$hw_disk_discard = $::os_service_default, $hw_disk_discard = $::os_service_default,
$hw_machine_type = $::os_service_default, $hw_machine_type = $::os_service_default,
$sysinfo_serial = $::os_service_default, $sysinfo_serial = $::os_service_default,
$inject_password = false, $inject_password = $::os_service_default,
$inject_key = false, $inject_key = $::os_service_default,
$inject_partition = -2, $inject_partition = $::os_service_default,
$enabled_perf_events = $::os_service_default, $enabled_perf_events = $::os_service_default,
$device_detach_attempts = $::os_service_default, $device_detach_attempts = $::os_service_default,
$device_detach_timeout = $::os_service_default, $device_detach_timeout = $::os_service_default,

12
spec/classes/nova_compute_libvirt_spec.rb
View File

@ -54,9 +54,9 @@ describe 'nova::compute::libvirt' do
it { is_expected.to contain_nova_config('libvirt/snapshot_image_format').with_value('<SERVICE DEFAULT>')} it { is_expected.to contain_nova_config('libvirt/snapshot_image_format').with_value('<SERVICE DEFAULT>')}
it { is_expected.to contain_nova_config('libvirt/snapshots_directory').with_value('<SERVICE DEFAULT>')} it { is_expected.to contain_nova_config('libvirt/snapshots_directory').with_value('<SERVICE DEFAULT>')}
it { is_expected.to contain_nova_config('libvirt/disk_cachemodes').with_ensure('absent')} it { is_expected.to contain_nova_config('libvirt/disk_cachemodes').with_ensure('absent')}
it { is_expected.to contain_nova_config('libvirt/inject_password').with_value(false)} it { is_expected.to contain_nova_config('libvirt/inject_password').with_value('<SERVICE DEFAULT>')}
it { is_expected.to contain_nova_config('libvirt/inject_key').with_value(false)} it { is_expected.to contain_nova_config('libvirt/inject_key').with_value('<SERVICE DEFAULT>')}
it { is_expected.to contain_nova_config('libvirt/inject_partition').with_value(-2)} it { is_expected.to contain_nova_config('libvirt/inject_partition').with_value('<SERVICE DEFAULT>')}
it { is_expected.to contain_nova_config('libvirt/enabled_perf_events').with_value('<SERVICE DEFAULT>')} it { is_expected.to contain_nova_config('libvirt/enabled_perf_events').with_value('<SERVICE DEFAULT>')}
it { is_expected.to contain_nova_config('libvirt/sysinfo_serial').with_value('<SERVICE DEFAULT>')} it { is_expected.to contain_nova_config('libvirt/sysinfo_serial').with_value('<SERVICE DEFAULT>')}
it { is_expected.to contain_nova_config('libvirt/device_detach_attempts').with_value('<SERVICE DEFAULT>')} it { is_expected.to contain_nova_config('libvirt/device_detach_attempts').with_value('<SERVICE DEFAULT>')}
@ -280,9 +280,9 @@ describe 'nova::compute::libvirt' do
it { is_expected.to contain_nova_config('DEFAULT/compute_driver').with_value('libvirt.LibvirtDriver')} it { is_expected.to contain_nova_config('DEFAULT/compute_driver').with_value('libvirt.LibvirtDriver')}
it { is_expected.to contain_nova_config('libvirt/virt_type').with_value('kvm')} it { is_expected.to contain_nova_config('libvirt/virt_type').with_value('kvm')}
it { is_expected.to contain_nova_config('libvirt/inject_password').with_value(false)} it { is_expected.to contain_nova_config('libvirt/inject_password').with_value('<SERVICE DEFAULT>')}
it { is_expected.to contain_nova_config('libvirt/inject_key').with_value(false)} it { is_expected.to contain_nova_config('libvirt/inject_key').with_value('<SERVICE DEFAULT>')}
it { is_expected.to contain_nova_config('libvirt/inject_partition').with_value(-2)} it { is_expected.to contain_nova_config('libvirt/inject_partition').with_value('<SERVICE DEFAULT>')}
it { is_expected.to contain_nova_config('vnc/server_listen').with_value('127.0.0.1')} it { is_expected.to contain_nova_config('vnc/server_listen').with_value('127.0.0.1')}
it { is_expected.to contain_nova_config('libvirt/enabled_perf_events').with_value('<SERVICE DEFAULT>')} it { is_expected.to contain_nova_config('libvirt/enabled_perf_events').with_value('<SERVICE DEFAULT>')}
it { is_expected.to contain_nova_config('libvirt/device_detach_attempts').with_value('<SERVICE DEFAULT>')} it { is_expected.to contain_nova_config('libvirt/device_detach_attempts').with_value('<SERVICE DEFAULT>')}