diff --git a/attributes/default.rb b/attributes/default.rb index 87da26dd..3f5a6b3d 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -371,6 +371,7 @@ default['openstack']['compute']['config']['disk_allocation_ratio'] = 1.0 default['openstack']['compute']['config']['snapshot_image_format'] = 'qcow2' default['openstack']['compute']['config']['allow_resize_to_same_host'] = false default['openstack']['compute']['config']['resize_confirm_window'] = 0 +default['openstack']['compute']['config']['heal_instance_info_cache_interval'] = 60 default['openstack']['compute']['config']['reserved_host_disk_mb'] = 0 default['openstack']['compute']['config']['reserved_host_memory_mb'] = 512 # `start` will cause nova-compute to error out if a VM is already running, where diff --git a/spec/nova-common_spec.rb b/spec/nova-common_spec.rb index f1118a93..8a54f991 100644 --- a/spec/nova-common_spec.rb +++ b/spec/nova-common_spec.rb @@ -97,6 +97,11 @@ describe 'openstack-compute::nova-common' do end end + it 'has default heal_instance_info_cache_interval set' do + line = 'heal_instance_info_cache_interval=60' + expect(chef_run).to render_file(file.name).with_content(/^#{line}$/) + end + it 'has default ssl options set' do %w(ssl_only=false cert=self.pem diff --git a/templates/default/nova.conf.erb b/templates/default/nova.conf.erb index 8c0d6728..09be2852 100644 --- a/templates/default/nova.conf.erb +++ b/templates/default/nova.conf.erb @@ -185,6 +185,8 @@ start_guests_on_host_boot=<%= node["openstack"]["compute"]["config"]["start_gues resume_guests_state_on_host_boot=<%= node["openstack"]["compute"]["config"]["resume_guests_state_on_host_boot"] %> allow_resize_to_same_host=<%= node["openstack"]["compute"]["config"]["allow_resize_to_same_host"] %> resize_confirm_window=<%= node["openstack"]["compute"]["config"]["resize_confirm_window"] %> +# (IntOpt) Number of seconds between instance network information cache updates. +heal_instance_info_cache_interval=<%= node['openstack']['compute']['config']['heal_instance_info_cache_interval'] %> live_migration_retry_count=<%= node["openstack"]["compute"]["config"]["live_migration_retry_count"] %> ##### QUOTAS #####