From 5283e9bd5d92ca7ed9c4336196f2d2ce03089aab Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Mon, 19 Oct 2015 20:06:34 -0500 Subject: [PATCH] Removed deprecated vif driver This removes the deprecated vif driver in Juno. Change-Id: I3ae8e9be51e0290b74e1f660f9f8d15326efca22 Closes-bug: #1501029 Signed-off-by: Kevin Carter --- playbooks/roles/os_nova/defaults/main.yml | 1 - playbooks/roles/os_nova/templates/nova.conf.j2 | 2 -- 2 files changed, 3 deletions(-) diff --git a/playbooks/roles/os_nova/defaults/main.yml b/playbooks/roles/os_nova/defaults/main.yml index 8c8a479421..6080122c39 100644 --- a/playbooks/roles/os_nova/defaults/main.yml +++ b/playbooks/roles/os_nova/defaults/main.yml @@ -157,7 +157,6 @@ nova_console_type: spice ## Nova global config nova_cpu_mode: host-model nova_linuxnet_interface_driver: nova.network.linux_net.NeutronLinuxBridgeInterfaceDriver -nova_libvirt_vif_driver: nova.virt.libvirt.vif.NeutronLinuxBridgeVIFDriver nova_firewall_driver: nova.virt.firewall.NoopFirewallDriver nova_compute_driver: libvirt.LibvirtDriver nova_max_age: 0 diff --git a/playbooks/roles/os_nova/templates/nova.conf.j2 b/playbooks/roles/os_nova/templates/nova.conf.j2 index a7257e63b9..4d4553dae2 100644 --- a/playbooks/roles/os_nova/templates/nova.conf.j2 +++ b/playbooks/roles/os_nova/templates/nova.conf.j2 @@ -89,7 +89,6 @@ auth_strategy = keystone ## Vif linuxnet_interface_driver = {{ nova_linuxnet_interface_driver }} -libvirt_vif_driver = {{ nova_libvirt_vif_driver }} libvirt_vif_type = ethernet vif_plugging_timeout = 10 vif_plugging_is_fatal = False @@ -221,7 +220,6 @@ rabbit_hosts = {{ rabbitmq_servers }} [libvirt] -vif_driver = {{ nova_libvirt_vif_driver }} inject_partition = {{ nova_libvirt_inject_partition }} inject_password = {{ nova_libvirt_inject_password }} inject_key = {{ nova_libvirt_inject_key }}