diff options
author | Dan Sneddon <dsneddon@redhat.com> | 2015-06-27 15:01:28 -0700 |
---|---|---|
committer | Dan Sneddon <dsneddon@redhat.com> | 2015-06-27 15:01:28 -0700 |
commit | aaca462d9a0fd075e6488bc9686a2b57eb8f9a6a (patch) | |
tree | 6e789b0b0dc2b175d4044aa5897f8dda399d6827 /tripleo_heat_merge/merge.py | |
parent | 1e804d5b2e5324de84772cf45639cdc78d398d35 (diff) |
Remove bridge from nic1 in network bond templates
The bridge that is built on the bonds in the bond-with-vlans
example has an extraneous bridge on the storage and compute
templates, and an incorrect bridge on the controller template.
There is no reason to do anything on nic1, which is assumed to
be the provisioning interface, because it will be configured by
DHCP. Also, on the controller template we actually want br-ex
to contain the VLAN with the external network, rather than be
configured on the provisioning interface.
Change-Id: Ibe2343d5281f7b63a7b63b17d96d8442d0b96105
Diffstat (limited to 'tripleo_heat_merge/merge.py')
0 files changed, 0 insertions, 0 deletions