From 5acf4e708c68147ef20c67f8d4648e6027c1e20d Mon Sep 17 00:00:00 2001
From: Feng Pan <fpan@redhat.com>
Date: Fri, 13 Apr 2018 22:22:40 -0400
Subject: Fix nosdn fdio scenario

- Update networking-vpp to use master branch
- Update THT vpp ml2 environment file with correct parameters
- Update external network creation command to use 'externa' as
  provider network name.
- Remove vpp network settings file as it's not used

apex-tripleo-heat-templates: Ia25db8456f1ad6beb96c7b9b5f318b166ef4576a
apex-puppet-tripleo: I231054a433eb7e598a6e24f6eaea02d476e776de

Change-Id: I4a1f68c75ae3b7d2a5b347d05abf0d025e8b116b
Signed-off-by: Feng Pan <fpan@redhat.com>
---
 .gitignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index f42d4c6e..2789a249 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,8 @@
 /docs_output/
 /releng/
 apex.egg-info/
-/apex/tests/playbooks/*.retry
 coverage.xml
 nosetests.xml
-ci/*.log
 .*
+*.log
+*.retry
-- 
cgit 1.2.3-korg