From ab45cf05801d7f1a037cdc4071196f162c966c22 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Fri, 28 Jul 2017 12:45:29 -0400 Subject: [PATCH] Remove nova_linuxnet_interface_driver option This option is strictly a nova-net option. nova-api previously still read this option for some nova-net related code and actually added an iptables rule to allow metadata traffic. Yuck. Related bug fixes this issue in nova and makes this option dead weight. Change-Id: I717658c65b30e2dda58f271aa06ffc9db01bde4a Related-Bug: #1687187 --- defaults/main.yml | 3 --- templates/nova.conf.j2 | 1 - 2 files changed, 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 8be55288..c8e00b9a 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -313,9 +313,6 @@ nova_external_ssl: false nova_secure_proxy_ssl_header: HTTP_X_FORWARDED_PROTO ## Nova global config -nova_linuxnet_interface_driver: nova.network.linux_net.NeutronLinuxBridgeInterfaceDriver - - nova_max_age: 0 nova_remove_unused_resized_minimum_age_seconds: 3600 nova_image_cache_manager_interval: 0 diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2 index 9cd77e6f..01918fd5 100644 --- a/templates/nova.conf.j2 +++ b/templates/nova.conf.j2 @@ -55,7 +55,6 @@ firewall_driver = {{ nova_firewall_driver }} my_ip = {% if nova_management_address == 'localhost' %}127.0.0.1{% else %}{{ nova_management_address }}{% endif %} ## Vif -linuxnet_interface_driver = {{ nova_linuxnet_interface_driver }} {% if nova_virt_type in ['kvm', 'lxd', 'qemu', 'xen'] %} libvirt_vif_type = ethernet {% endif %}