Add resize_confirm_window configuration option

Add resize_confirm_window configuration option to nova.conf.erb

Closes-Bug: #1328522
Change-Id: I9839c7629bb58489468fd98032abcb76a87725f7

CHANGELOG.md

@@ -1,6 +1,10 @@
 # CHANGELOG for cookbook-openstack-compute
 
 This file is used to list changes made in each version of cookbook-openstack-compute.
+
+##9.2.6
+* Allow resize_confirm_window to have attribute overrides
+
 ## 9.2.5
 * Create state and lock directories
 

README.md

@@ -131,6 +131,7 @@ Openstack Compute attributes are in the attribute namespace ["openstack"]["compu
 * `openstack["compute"]["config"]["resume_guests_state_on_host_boot"]` - Whether to start guests that were running before the host rebooted
 * `openstack["compute"]["config"]["disk_allocation_ratio"]` - Virtual disk to physical disk allocation ratio (default 1.0)
 * `openstack["compute"]["config"]["allow_resize_to_same_host"]` - Allow destination machine to match source for resize. Useful when testing in single-host environments (default is false)
+* `openstack["compute"]["config"]["resize_confirm_window"]` -  Automatically confirm resizes after N seconds, Set to 0 to disable (default is 0)
 * `openstack["compute"]["config"]["disk_cachemodes"]` - Cachemodes to use for different disk types e.g: "file=directsync,block=none".  Valid cache values are "default", "none", "writethrough", "writeback", "directsync" and "unsafe".
 * `openstack["compute"]["api"]["signing_dir"]` - Keystone PKI needs a location to hold the signed tokens
 * `openstack["compute"]["api"]["signing_dir"]` - Keystone PKI needs a location to hold the signed tokens

attributes/default.rb

@@ -231,6 +231,7 @@ default['openstack']['compute']['config']['ram_allocation_ratio'] = 1.5
 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
 # `start` will cause nova-compute to error out if a VM is already running, where
 # `resume` checks to see if it is running first.
 default['openstack']['compute']['config']['start_guests_on_host_boot'] = false

metadata.rb

@@ -4,7 +4,7 @@ maintainer_email 'matt@opscode.com'
 license          'Apache 2.0'
 description      'The OpenStack Compute service Nova.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '9.2.5'
+version          '9.2.6'
 
 recipe 'openstack-compute::api-ec2', 'Installs AWS EC2 compatible API'
 recipe 'openstack-compute::api-metadata', 'Installs the nova metadata package'

spec/nova-common_spec.rb

@@ -111,6 +111,11 @@ describe 'openstack-compute::nova-common' do
         expect(chef_run).to render_file(file.name).with_content(line)
       end
 
+      it 'has default resize_confirm_window set' do
+        line = /^resize_confirm_window=0$/
+        expect(chef_run).to render_file(file.name).with_content(line)
+      end
+
       it 'has default RPC/AMQP options set' do
         [/^rpc_backend=nova.openstack.common.rpc.impl_kombu$/,
          /^rpc_thread_pool_size=64$/,

templates/default/nova.conf.erb

@@ -206,6 +206,7 @@ osapi_compute_link_prefix = <%= @osapi_compute_link_prefix %>
 start_guests_on_host_boot=<%= node["openstack"]["compute"]["config"]["start_guests_on_host_boot"] %>
 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"] %>
 
 ##### QUOTAS #####
 # (StrOpt) default driver to use for quota checks (default: nova.quota.DbQuotaDriver)