Fixes IP failure during os-collect-config ping check

Moves the (to be) dpdk interface to br-phy so that the ping check passes
after os-net-config.  The puppet then moves the interface off of br-phy
before binding to dpdk.

opnfv-tht-pr: 31

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

diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2
index bdf26cb..a033314 100644 (file)
--- a/build/nics-template.yaml.jinja2
+++ b/build/nics-template.yaml.jinja2
@@ -156,11 +156,6 @@ resources:
             {%- set nic_index = 2 %}
             {%- if 'private_network' in enabled_networks and vlans['private_network'] == 'native' %}
             {%- if ovs_dpdk_bridge == 'br-phy' %}
-            -
-              type: interface
-              name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %}
-              use_dhcp: false
-
             -
               type: ovs_bridge
               name: {{ ovs_dpdk_bridge }}
@@ -168,6 +163,12 @@ resources:
               addresses:
                 -
                   ip_netmask: {get_param: TenantIpSubnet}
+              members:
+                -
+                  type: interface
+                  name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %}
+                  # force the MAC address of the bridge to this interface
+                  primary: true
             -
               type: ovs_bridge
               name: br-tun