openstack
/
cookbook-openstack-compute
Code Issues Proposed changes

Enable config_drive_format parameter for nova 

After this patch https://review.openstack.org/#/c/133919/ has been
merged, we can do live-migration with the vfat config drive now.

This patch enable config_drive_format parameter for this purpose.

Change-Id: I3bb25d48bb8882ad898304b61d52fa2a75c2101b
This commit is contained in:
lqslan 2015-04-09 17:10:13 +08:00
parent a29ad4be74
commit 54de5f9f8b
4 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -138,6 +138,7 @@ Openstack Compute attributes are in the attribute namespace ["openstack"]["compu
* `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"]["config"]["live_migration_retry_count"]` - Number of 1 second retries needed in live_migration
* `openstack["compute"]["config"]["flat_injected"]` - Whether to attempt to inject network setup into guest. Used by config_drive support.
* `openstack["compute"]["config"]["config_drive_format"]` - Config drive format.
* `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
* `openstack["compute"]["rpc_thread_pool_size"]` - Size of RPC thread pool (default 64)

2
attributes/default.rb
View File

@ -316,6 +316,8 @@ default['openstack']['compute']['config']['resume_guests_state_on_host_boot'] =
# force_config_drive can be nil or 'always',
# if it's 'always', nova will create a config drive regardless of if the user specified --config-drive true in their nova boot call
default['openstack']['compute']['config']['force_config_drive'] = nil
# Config drive format, should be one of iso9660 or vfat
default['openstack']['compute']['config']['config_drive_format'] = 'iso9660'
default['openstack']['compute']['config']['mkisofs_cmd'] = 'genisoimage'
default['openstack']['compute']['config']['injected_network_template'] = '$pybasedir/nova/virt/interfaces.template'
default['openstack']['compute']['config']['flat_injected'] = false

5
spec/nova-common_spec.rb
View File

@ -542,6 +542,11 @@ describe 'openstack-compute::nova-common' do
/^force_config_drive=always$/)
end
it 'has a config_drive_format setting' do
expect(chef_run).to render_file(file.name).with_content(
/^config_drive_format=iso9660$/)
end
it 'has a os_region_name setting' do
chef_run.node.set['openstack']['node'] = 'RegionOne'
expect(chef_run).to render_config_file(file.name)\

1
templates/default/nova.conf.erb
View File

@ -259,6 +259,7 @@ disk_allocation_ratio=<%= node["openstack"]["compute"]["config"]["disk_allocatio
<% if node["openstack"]["compute"]["config"]["force_config_drive"] %>
force_config_drive=<%= node["openstack"]["compute"]["config"]["force_config_drive"] %>
<% end %>
config_drive_format=<%= node["openstack"]["compute"]["config"]["config_drive_format"] %>
mkisofs_cmd=<%= node["openstack"]["compute"]["config"]["mkisofs_cmd"] %>
injected_network_template=<%= node["openstack"]["compute"]["config"]["injected_network_template"] %>
flat_injected=<%= node["openstack"]["compute"]["config"]["flat_injected"] %>