From f1b5d684bd423c08185f1e99962f16950951b45a Mon Sep 17 00:00:00 2001 From: Matthew Black Date: Fri, 9 Aug 2013 10:14:31 -0400 Subject: [PATCH] Added force_config_drive param for compute This adds the ability to turn on config drive. nova::compute has the option, but openstack::compute does not have a parameter to pass to nova::compute. Change-Id: Icd680a296ac4251eeb33e4ac6feca9527ccc247b --- manifests/compute.pp | 2 ++ spec/classes/openstack_compute_spec.rb | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/manifests/compute.pp b/manifests/compute.pp index 98c3c11..35df2cc 100644 --- a/manifests/compute.pp +++ b/manifests/compute.pp @@ -96,6 +96,7 @@ class openstack::compute ( # General $migration_support = false, $verbose = false, + $force_config_drive = false, $enabled = true ) { @@ -144,6 +145,7 @@ class openstack::compute ( vnc_enabled => $vnc_enabled, vncserver_proxyclient_address => $internal_address, vncproxy_host => $vncproxy_host, + force_config_drive => $force_config_drive, } # Configure libvirt for nova-compute diff --git a/spec/classes/openstack_compute_spec.rb b/spec/classes/openstack_compute_spec.rb index f6a0a56..8f3c78a 100644 --- a/spec/classes/openstack_compute_spec.rb +++ b/spec/classes/openstack_compute_spec.rb @@ -46,7 +46,8 @@ describe 'openstack::compute' do :enabled => true, :vnc_enabled => true, :vncserver_proxyclient_address => '127.0.0.2', - :vncproxy_host => false + :vncproxy_host => false, + :force_config_drive => false ) should contain_class('nova::compute::libvirt').with( :libvirt_type => 'kvm', @@ -103,6 +104,7 @@ describe 'openstack::compute' do :libvirt_type => 'qemu', :vncproxy_host => '127.0.0.2', :vnc_enabled => false, + :force_config_drive => true, :verbose => true ) end @@ -122,7 +124,8 @@ describe 'openstack::compute' do :enabled => true, :vnc_enabled => false, :vncserver_proxyclient_address => '127.0.0.1', - :vncproxy_host => '127.0.0.2' + :vncproxy_host => '127.0.0.2', + :force_config_drive => true ) should contain_class('nova::compute::libvirt').with( :libvirt_type => 'qemu',