From: Feng Pan <fpan@redhat.com>
Date: Fri, 7 Oct 2016 19:20:54 +0000 (-0400)
Subject: Fix tenant_nic loopup error for nosdn fdio scenario
X-Git-Tag: colorado.2.0~23
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F41%2F22841%2F3;p=apex.git

Fix tenant_nic loopup error for nosdn fdio scenario

Currently we assume tenant_nic is a virtual interface name (like nic1),
so we perform an extra hiera lookup, this is not needed if the user
specifies physical nic name in network_settings file. This patch defaults
the hiera lookup of the nic interface lookup to be what the user specifies
if a hiera value can't be found.

JIRA: APEX-293

opnfv-tht-pr: 88

Change-Id: I5f6d3addbaf20c4dfec532b1292ddb9424552a1f
Signed-off-by: Feng Pan <fpan@redhat.com>
---

diff --git a/ci/PR_revision.log b/ci/PR_revision.log
index 03d6ed11..16cf08f8 100644
--- a/ci/PR_revision.log
+++ b/ci/PR_revision.log
@@ -44,3 +44,4 @@
 82,Fixes neutron sdnvpn config resource
 86,Moves sdnvpn config to env file
 87,Pass vlan flag to fdio module when vlan is used for tenant network
+88,Default tenant_nic to its physical name