openstack/openstack-ansible-os_nova
Code Issues Proposed changes

Merge "Removed deprecated vif driver"

Browse Source
This commit is contained in:
Jenkins 2015-10-20 10:38:40 +00:00 committed by Gerrit Code Review
commit 4f0be0c76f
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
defaults/main.yml
View File

@ -157,7 +157,6 @@ nova_console_type: spice
## Nova global config ## Nova global config
nova_cpu_mode: host-model nova_cpu_mode: host-model
nova_linuxnet_interface_driver: nova.network.linux_net.NeutronLinuxBridgeInterfaceDriver 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_firewall_driver: nova.virt.firewall.NoopFirewallDriver
nova_compute_driver: libvirt.LibvirtDriver nova_compute_driver: libvirt.LibvirtDriver
nova_max_age: 0 nova_max_age: 0

2
templates/nova.conf.j2
View File

@ -89,7 +89,6 @@ auth_strategy = keystone
## Vif ## Vif
linuxnet_interface_driver = {{ nova_linuxnet_interface_driver }} linuxnet_interface_driver = {{ nova_linuxnet_interface_driver }}
libvirt_vif_driver = {{ nova_libvirt_vif_driver }}
libvirt_vif_type = ethernet libvirt_vif_type = ethernet
vif_plugging_timeout = 10 vif_plugging_timeout = 10
vif_plugging_is_fatal = False vif_plugging_is_fatal = False
@ -221,7 +220,6 @@ rabbit_hosts = {{ rabbitmq_servers }}
[libvirt] [libvirt]
vif_driver = {{ nova_libvirt_vif_driver }}
inject_partition = {{ nova_libvirt_inject_partition }} inject_partition = {{ nova_libvirt_inject_partition }}
inject_password = {{ nova_libvirt_inject_password }} inject_password = {{ nova_libvirt_inject_password }}
inject_key = {{ nova_libvirt_inject_key }} inject_key = {{ nova_libvirt_inject_key }}