diff options
| author |   Dan Prince <dprince@redhat.com> | 2015-06-09 13:30:17 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2015-06-09 13:32:31 -0400 |
| commit | 5041ff897dcfb2b9cec5bff1f15060913704e43a (patch) | |
| tree | 1abd445cd134120bd56da31e078dc6557ef197c1 /network/config/single-nic-vlans | |
| parent | ca36b5d9e19e7eb5e1e4de0d6bae4e1d364f30fb (diff) | |
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
Diffstat (limited to 'network/config/single-nic-vlans')
5 files changed, 0 insertions, 5 deletions
diff --git a/network/config/single-nic-vlans/ceph-storage.yaml b/network/config/single-nic-vlans/ceph-storage.yaml index 9ab1734d..6bffb07e 100644 --- a/network/config/single-nic-vlans/ceph-storage.yaml +++ b/network/config/single-nic-vlans/ceph-storage.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 - diff --git a/network/config/single-nic-vlans/cinder-storage.yaml b/network/config/single-nic-vlans/cinder-storage.yaml index 72f6126c..e9f6c770 100644 --- a/network/config/single-nic-vlans/cinder-storage.yaml +++ b/network/config/single-nic-vlans/cinder-storage.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 - 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 - diff --git a/network/config/single-nic-vlans/controller.yaml b/network/config/single-nic-vlans/controller.yaml index 5e1d5d44..aab722c0 100644 --- a/network/config/single-nic-vlans/controller.yaml +++ b/network/config/single-nic-vlans/controller.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 - diff --git a/network/config/single-nic-vlans/swift-storage.yaml b/network/config/single-nic-vlans/swift-storage.yaml index 5733b316..93a91688 100644 --- a/network/config/single-nic-vlans/swift-storage.yaml +++ b/network/config/single-nic-vlans/swift-storage.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 - |