From 17e414311f52fa3e040777c8a7f0067be4bea9bf Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Fri, 25 Aug 2017 15:31:55 +1200
Subject: [PATCH] Don't use docker-network.yaml env

All this network config does is create br-ex, which is now done in
docker/services/neutron-ovs-agent.yaml regardless of what network
config is used.

Change-Id: I841e2da42a019e6d8341dae168501fbaf57855e6
Related-Bug: #1691403
Depends-On: Ie425148b0ad0f38e149c5fa0a97d98ec35d0a5bb
---
 roles/overcloud-deploy/tasks/pre-deploy.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/roles/overcloud-deploy/tasks/pre-deploy.yml b/roles/overcloud-deploy/tasks/pre-deploy.yml
index 0fc7f17fa..053636db6 100644
--- a/roles/overcloud-deploy/tasks/pre-deploy.yml
+++ b/roles/overcloud-deploy/tasks/pre-deploy.yml
@@ -180,9 +180,6 @@
       {% if enable_pacemaker|bool %}
       -e {{ overcloud_templates_path }}/environments/docker-ha.yaml
       {% endif %}
-      {% if not network_isolation|bool %}
-      -e {{ overcloud_templates_path }}/environments/docker-network.yaml
-      {% endif %}
       -e {{ working_dir }}/containers-default-parameters.yaml
   when:
     - containerized_overcloud|bool