Merge pull request #177 from bodepd/make_vif_driver_configurable

Make libvit_vif_driver configurable
derekhiggins · Oct 31, 2012 · 041142d · 041142d
2 parents fd3388c + 2c98693
commit 041142d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/manifests/compute/quantum.pp b/manifests/compute/quantum.pp
@@ -1,9 +1,9 @@
 class nova::compute::quantum (
-
+  $libvirt_vif_driver = 'nova.virt.libvirt.vif.LibvirtOpenVswitchDriver'
 ){
 
   nova_config {
-    'libvirt_vif_driver':             value => 'nova.virt.libvirt.vif.LibvirtOpenVswitchDriver';
+    'libvirt_vif_driver':             value => $libvirt_vif_driver;
     #'libvirt_vif_driver':             value => 'nova.virt.libvirt.vif.LibvirtHybirdOVSBridgeDriver';
     'libvirt_use_virtio_for_bridges': value => 'True';
   }

diff --git a/spec/classes/nova_compute_quantum_spec.rb b/spec/classes/nova_compute_quantum_spec.rb
@@ -0,0 +1,14 @@
+require 'spec_helper'
+describe 'nova::compute::quantum' do
+
+  it { should contain_nova_config('libvirt_use_virtio_for_bridges').with_value('True')}
+  it { should contain_nova_config('libvirt_vif_driver').with_value('nova.virt.libvirt.vif.LibvirtOpenVswitchDriver')}
+
+  context 'when overriding params' do
+    let :params do
+      {:libvirt_vif_driver => 'foo' }
+    end
+    it { should contain_nova_config('libvirt_vif_driver').with_value('foo')}
+  end
+
+end