From d96bdd118db4b503d7c8999d0dd3fc5daaf1daa3 Mon Sep 17 00:00:00 2001
From: Andrew McLeod <andrew.mcleod@canonical.com>
Date: Wed, 2 Oct 2019 13:11:46 +0200
Subject: [PATCH] disable add_dataport_to_netplan for dvr deployments

---
 zaza/openstack/utilities/openstack.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/zaza/openstack/utilities/openstack.py b/zaza/openstack/utilities/openstack.py
index 465d73c9d..e6f487913 100644
--- a/zaza/openstack/utilities/openstack.py
+++ b/zaza/openstack/utilities/openstack.py
@@ -575,6 +575,9 @@ def configure_gateway_ext_port(novaclient, neutronclient,
     """
     if dvr_mode:
         uuids = get_ovs_uuids()
+        # If dvr, do not attempt to persist nic in netplan
+        # https://github.com/openstack-charmers/zaza-openstack-tests/issues/78
+        add_dataport_to_netplan = False
     else:
         uuids = get_gateway_uuids()