From: Tim Rozet <trozet@redhat.com>
Date: Sun, 27 Aug 2017 23:21:43 +0000 (-0400)
Subject: Fixes external network with baremetal interface
X-Git-Tag: opnfv-5.0.0~83
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=583ae93f658e84a349638aeb33209aaae6cad63f;p=apex.git

Fixes external network with baremetal interface

Change-Id: Icd65ffbd14dee603e5b2a0a42e9d0cdfd98c694c
Signed-off-by: Tim Rozet <trozet@redhat.com>
---

diff --git a/apex/deploy.py b/apex/deploy.py
index ceef160a..6a08b36f 100644
--- a/apex/deploy.py
+++ b/apex/deploy.py
@@ -291,8 +291,13 @@ def main():
             if uc_external:
                 jump_networks.append('external')
             for network in jump_networks:
-                iface = net_settings['networks'][network]['installer_vm'][
-                    'members'][0]
+                if network == 'external':
+                    # TODO(trozet): enable vlan secondary external networks
+                    iface = net_settings['networks'][network][0][
+                        'installer_vm']['members'][0]
+                else:
+                    iface = net_settings['networks'][network]['installer_vm'][
+                        'members'][0]
                 bridge = "br-{}".format(network)
                 jumphost.attach_interface_to_ovs(bridge, iface, network)
         # Dump all settings out to temp bash files to be sourced