From aaca462d9a0fd075e6488bc9686a2b57eb8f9a6a Mon Sep 17 00:00:00 2001 From: Dan Sneddon Date: Sat, 27 Jun 2015 15:01:28 -0700 Subject: 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 | 10 ---------- network/config/bond-with-vlans/cinder-storage.yaml | 10 ---------- network/config/bond-with-vlans/compute.yaml | 10 ---------- network/config/bond-with-vlans/controller.yaml | 12 +----------- network/config/bond-with-vlans/swift-storage.yaml | 10 ---------- 5 files changed, 1 insertion(+), 51 deletions(-) (limited to 'network/config/bond-with-vlans') diff --git a/network/config/bond-with-vlans/ceph-storage.yaml b/network/config/bond-with-vlans/ceph-storage.yaml index ed9fff7a..cd70cbef 100644 --- a/network/config/bond-with-vlans/ceph-storage.yaml +++ b/network/config/bond-with-vlans/ceph-storage.yaml @@ -48,16 +48,6 @@ resources: config: os_net_config: network_config: - - - type: ovs_bridge - name: br-storage - use_dhcp: true - members: - - - type: interface - name: nic1 - # force the MAC address of the bridge to this interface - primary: true - type: ovs_bridge name: br-bond diff --git a/network/config/bond-with-vlans/cinder-storage.yaml b/network/config/bond-with-vlans/cinder-storage.yaml index 95733fca..866112cb 100644 --- a/network/config/bond-with-vlans/cinder-storage.yaml +++ b/network/config/bond-with-vlans/cinder-storage.yaml @@ -51,16 +51,6 @@ resources: config: os_net_config: network_config: - - - type: ovs_bridge - name: br-storage - use_dhcp: true - members: - - - type: interface - name: nic1 - # force the MAC address of the bridge to this interface - primary: true - type: ovs_bridge name: br-bond diff --git a/network/config/bond-with-vlans/compute.yaml b/network/config/bond-with-vlans/compute.yaml index 709b3b5b..5105ee14 100644 --- a/network/config/bond-with-vlans/compute.yaml +++ b/network/config/bond-with-vlans/compute.yaml @@ -51,16 +51,6 @@ resources: config: os_net_config: network_config: - - - type: ovs_bridge - name: {get_input: bridge_name} - use_dhcp: true - members: - - - type: interface - name: nic1 - # force the MAC address of the bridge to this interface - primary: true - type: ovs_bridge name: br-bond diff --git a/network/config/bond-with-vlans/controller.yaml b/network/config/bond-with-vlans/controller.yaml index 16a0dec2..2498376d 100644 --- a/network/config/bond-with-vlans/controller.yaml +++ b/network/config/bond-with-vlans/controller.yaml @@ -59,23 +59,13 @@ resources: config: os_net_config: network_config: - - - type: ovs_bridge - name: {get_input: bridge_name} - use_dhcp: true - members: - - - type: interface - name: nic1 - # force the MAC address of the bridge to this interface - primary: true - type: ovs_bridge name: br-bond members: - type: ovs_bond - name: bond1 + name: {get_input: bridge_name} ovs_options: {get_param: BondInterfaceOvsOptions} members: - diff --git a/network/config/bond-with-vlans/swift-storage.yaml b/network/config/bond-with-vlans/swift-storage.yaml index 6549ce7a..f31ed0e7 100644 --- a/network/config/bond-with-vlans/swift-storage.yaml +++ b/network/config/bond-with-vlans/swift-storage.yaml @@ -51,16 +51,6 @@ resources: config: os_net_config: network_config: - - - type: ovs_bridge - name: br-storage - use_dhcp: true - members: - - - type: interface - name: nic1 - # force the MAC address of the bridge to this interface - primary: true - type: ovs_bridge name: br-bond -- cgit 1.2.3-korg