Remove bridge from nic1 in network bond templates
authorDan Sneddon <dsneddon@redhat.com>
Sat, 27 Jun 2015 22:01:28 +0000 (15:01 -0700)
committerDan Sneddon <dsneddon@redhat.com>
Sat, 27 Jun 2015 22:01:28 +0000 (15:01 -0700)
commitaaca462d9a0fd075e6488bc9686a2b57eb8f9a6a
tree6e789b0b0dc2b175d4044aa5897f8dda399d6827
parent1e804d5b2e5324de84772cf45639cdc78d398d35
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
network/config/bond-with-vlans/ceph-storage.yaml
network/config/bond-with-vlans/cinder-storage.yaml
network/config/bond-with-vlans/compute.yaml
network/config/bond-with-vlans/controller.yaml
network/config/bond-with-vlans/swift-storage.yaml