From b2b4da370e056f45d9fc1ec45fe911399ec536c2 Mon Sep 17 00:00:00 2001 From: zhangyangyang Date: Thu, 12 Oct 2017 17:14:52 +0800 Subject: [PATCH] Remove driver LibvirtOpenVswitchDriver nova.virt.libvirt.vif.LibvirtOpenVswitchDriver as vif_driver is removed from Icehouse. Change-Id: Ie9149797b893be05a3518a07a0514ac53434d798 --- manifests/compute/neutron.pp | 4 ---- spec/classes/nova_compute_neutron_spec.rb | 8 -------- 2 files changed, 12 deletions(-) diff --git a/manifests/compute/neutron.pp b/manifests/compute/neutron.pp index 43d6eeed9..3dff22d91 100644 --- a/manifests/compute/neutron.pp +++ b/manifests/compute/neutron.pp @@ -21,10 +21,6 @@ class nova::compute::neutron ( ) { include ::nova::deps - if $libvirt_vif_driver == 'nova.virt.libvirt.vif.LibvirtOpenVswitchDriver' { - fail('nova.virt.libvirt.vif.LibvirtOpenVswitchDriver as vif_driver is removed from Icehouse') - } - nova_config { 'libvirt/vif_driver': value => $libvirt_vif_driver; } diff --git a/spec/classes/nova_compute_neutron_spec.rb b/spec/classes/nova_compute_neutron_spec.rb index 27abe22ee..1c117a816 100644 --- a/spec/classes/nova_compute_neutron_spec.rb +++ b/spec/classes/nova_compute_neutron_spec.rb @@ -14,14 +14,6 @@ describe 'nova::compute::neutron' do it { is_expected.to contain_nova_config('DEFAULT/force_snat_range').with_ensure(:absent) } end - context 'when overriding with a removed libvirt_vif_driver param' do - let :params do - {:libvirt_vif_driver => 'nova.virt.libvirt.vif.LibvirtOpenVswitchDriver' } - end - - it_raises 'a Puppet::Error', /nova.virt.libvirt.vif.LibvirtOpenVswitchDriver as vif_driver is removed from Icehouse/ - end - context 'with force_snat_range parameter set to false' do let :params do { :force_snat_range => false, }