diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-06-28 10:19:51 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-06-28 10:19:51 -0400 |
| commit | 890ed0bcb03b61c5e5da596f89771d6196cd4231 (patch) | |
| tree | 044e799a5b605409e41d598c223eb1eb73abdc61 /build/nics-template.yaml.jinja2 | |
| parent | ec53529b33c22eb54f6d9af5aa14e4ef74340963 (diff) | |
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>
Diffstat (limited to 'build/nics-template.yaml.jinja2')
| -rw-r--r-- | build/nics-template.yaml.jinja2 | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2 index bdf26cb0..a0333149 100644 --- a/build/nics-template.yaml.jinja2 +++ b/build/nics-template.yaml.jinja2 @@ -157,17 +157,18 @@ resources: {%- 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 }} use_dhcp: false 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 |