Merge "Add force_config_drive to openstack::all"

manifests/all.pp

@@ -158,6 +158,7 @@ class openstack::all (
   $purge_nova_config       = false,
   $libvirt_vif_driver      = 'nova.virt.libvirt.vif.LibvirtGenericVIFDriver',
   $enabled_apis            = 'ec2,osapi_compute,metadata',
+  $force_config_drive      = false,
   # Virtualization
   $libvirt_type            = 'kvm',
   $migration_support       = false,
@@ -358,6 +359,7 @@ class openstack::all (
     vnc_enabled                   => $vnc_enabled,
     vncserver_proxyclient_address => $internal_address_real,
     vncproxy_host                 => $vncproxy_host,
+    force_config_drive            => $force_config_drive
   }
 
   # Configure libvirt for nova-compute

spec/classes/openstack_all_spec.rb

@@ -126,6 +126,25 @@ describe 'openstack::all' do
       end
     end
 
+    context 'with neutron_user_password, neutron_db_password, bridge_interface, ovs_local_ip, metadata_shared_secret, and force_config_drive set' do
+      before do
+        params.merge!(
+          :neutron_user_password  => 'neutron_user_password',
+          :neutron_db_password    => 'neutron_db_password',
+          :bridge_interface       => 'eth0',
+          :ovs_local_ip           => '10.0.1.1',
+          :metadata_shared_secret => 'shared_md_secret',
+          :force_config_drive     => true
+        )
+      end
+      it 'contains a nova::compute class with force_config_drive set' do
+        should contain_class('nova::compute').with(
+          :enabled                => true,
+          :force_config_drive     => true
+        )
+      end
+    end
+
     context 'with neutron_user_password, neutron_db_password, bridge_interface, ovs_local_ip, bridge_mappings, bridge_uplinks, and shared_secret set' do
       before do
         params.merge!(