From 5041ff897dcfb2b9cec5bff1f15060913704e43a Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Tue, 9 Jun 2015 13:30:17 -0400 Subject: Add BondInterfaceOvsOptions parameter This patch adds a new BondInterfaceOvsOptions to the bond-with-vlans network config templates. This can be used to configure things like LACP or the bonding mode via a nested stack heat parameter. The patch also removes the hard coded ovs_options relating to both bond-with-vlans and single-nic-with-vlans configurations which do not actually require this setting to be hard coded because by default OVS trunks vlan ports automatically. Change-Id: I3effbccba8ed7ed28d6ba715e5709275d4e7f984 --- network/config/single-nic-vlans/compute.yaml | 1 - 1 file changed, 1 deletion(-) (limited to 'network/config/single-nic-vlans/compute.yaml') diff --git a/network/config/single-nic-vlans/compute.yaml b/network/config/single-nic-vlans/compute.yaml index 93fe0b50..89a83b25 100644 --- a/network/config/single-nic-vlans/compute.yaml +++ b/network/config/single-nic-vlans/compute.yaml @@ -42,7 +42,6 @@ resources: - type: interface name: nic1 - ovs_options: vlan_mode=trunk trunks=10,20,30,40,50 # force the MAC address of the bridge to this interface primary: true - -- cgit 1.2.3-korg