From 9ecc15f0edf2460c2eb2cac8e9ccca8cbb8d3808 Mon Sep 17 00:00:00 2001
From: Feng Pan <fpan@redhat.com>
Date: Mon, 17 Jul 2017 16:25:25 -0400
Subject: Merge Newton private changes

- Add interface mapping data to hiera
- Add support for VPP interfaces
- Continue bringing up interfaces even if one fails
- Change hiera to json format

List of commits: https://github.com/openstack/os-net-config/compare/stable/newton...trozet:stable/danube

Change-Id: If7a2c6119bf613f1fc8846237b077cd8f0e26015
Signed-off-by: Feng Pan <fpan@redhat.com>
---
 os_net_config/cli.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'os_net_config/cli.py')

diff --git a/os_net_config/cli.py b/os_net_config/cli.py
index 479b3a3..c1676d0 100644
--- a/os_net_config/cli.py
+++ b/os_net_config/cli.py
@@ -126,6 +126,9 @@ def main(argv=sys.argv):
         logger.info('Using mapping file at: %s' % opts.mapping_file)
     iface_array = []
 
+    if os.path.isfile('/root/dpdk_bind_lock'):
+        return 0
+
     provider = None
     if opts.provider:
         if opts.provider == 'ifcfg':
-- 
cgit 1.2.3-korg