diff options
| author |   Feng Pan <fpan@redhat.com> | 2017-07-17 16:25:25 -0400 |
|---|---|---|
| committer | Feng Pan <fpan@redhat.com> | 2017-07-24 16:15:47 -0400 |
| commit | 9ecc15f0edf2460c2eb2cac8e9ccca8cbb8d3808 (patch) | |
| tree | 665bb067f795505f77d0d1eba98204e02dd11dec /os_net_config/cli.py | |
| parent | 02da9fd51b454b1954b04a462cb05a14598fa172 (diff) | |
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>
Diffstat (limited to 'os_net_config/cli.py')
| -rw-r--r-- | os_net_config/cli.py | 3 |
1 files changed, 3 insertions, 0 deletions
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': |