From 177d6c72c2ab14f12c1fa9a3d38d18380e127011 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 28 Jun 2019 11:24:15 +0100
Subject: [PATCH] Remove nova [DEFAULT]firewall_driver option

This is no longer supported, and has been removed from the
nova-dist.conf config file in RDO.

Change-Id: I6bfaf227ed997db0f39c1ff71ca6c73c49d2f060
---
 ansible/roles/nova/templates/nova.conf.j2 | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2
index 39bb43d9f9..228651a87d 100644
--- a/ansible/roles/nova/templates/nova.conf.j2
+++ b/ansible/roles/nova/templates/nova.conf.j2
@@ -14,12 +14,6 @@ metadata_workers = {{ openstack_service_workers }}
 metadata_listen = {{ api_interface_address }}
 metadata_listen_port = {{ nova_metadata_listen_port }}
 
-# NOTE(mgoddard): This option has been deprecated but RDO sets a different
-# default value for it in /usr/share/nova/nova-dist.conf which causes the
-# ironic virt driver to fail to load. See
-# https://bugs.launchpad.net/kolla-ansible/+bug/1701564.
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
-
 allow_resize_to_same_host = true
 
 {% if service_name == "nova-compute-ironic" %}