openstack
/
puppet-nova
Code Issues Proposed changes

Remove overrides about default values 

This patch removes re-definition of default values in nova::compute
class, so that we can use the defaults defined in nova.

Change-Id: I0c12053979d16cf039c183b17a5e31ae1c12c49e
This commit is contained in:
Takashi Kajinami 2020-09-23 14:18:42 +09:00
parent 54ba306d6b
commit e28dee84e1
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/compute.pp
View File

@ -10,7 +10,8 @@
#
# [*heal_instance_info_cache_interval*]
# (optional) Controls how often the instance info should be updated.
# Defaults to '60' , to disable you can set the value to zero.
# Defaults to $::os_service_default
# To disable you can set the value to zero.
#
# [*manage_service*]
# (optional) Whether to start/stop the service
@ -68,12 +69,12 @@
#
# [*force_raw_images*]
# (optional) Force backing images to raw format.
# Defaults to true
# Defaults to $::os_service_default
#
# [*reserved_host_memory*]
# Reserved host memory
# The amount of memory in MB reserved for the host.
# Defaults to '512'
# Defaults to $::os_service_default
#
# [*reserved_host_disk*]
# Reserved host disk
@ -227,10 +228,10 @@ class nova::compute (
$virtio_nic = false,
$instance_usage_audit = false,
$instance_usage_audit_period = 'month',
$force_raw_images = true,
$reserved_host_memory = '512',
$force_raw_images = $::os_service_default,
$reserved_host_memory = $::os_service_default,
$reserved_host_disk = $::os_service_default,
$heal_instance_info_cache_interval = '60',
$heal_instance_info_cache_interval = $::os_service_default,
$config_drive_format = $::os_service_default,
$resize_confirm_window = $::os_service_default,
$cpu_shared_set = $::os_service_default,

6
spec/classes/nova_compute_spec.rb
View File

@ -42,11 +42,11 @@ describe 'nova::compute' do
is_expected.to contain_nova_config('spice/enabled').with_value(false)
end
it { is_expected.to contain_nova_config('DEFAULT/reserved_host_memory_mb').with_value('512') }
it { is_expected.to contain_nova_config('DEFAULT/reserved_host_memory_mb').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('DEFAULT/reserved_host_disk_mb').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('DEFAULT/reserved_huge_pages').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('DEFAULT/heal_instance_info_cache_interval').with_value('60') }
it { is_expected.to contain_nova_config('DEFAULT/force_raw_images').with_value(true) }
it { is_expected.to contain_nova_config('DEFAULT/heal_instance_info_cache_interval').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('DEFAULT/force_raw_images').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('DEFAULT/resize_confirm_window').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('glance/verify_glance_signatures').with_value('<SERVICE DEFAULT>') }