aboutsummaryrefslogtreecommitdiffstats
path: root/network/config/bond-with-vlans/controller.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-01 14:22:35 +0000
committerGerrit Code Review <review@openstack.org>2015-07-01 14:22:35 +0000
commitcdc74dc79d406b09900e1b69fe10ab5474cc4f6d (patch)
tree20b9a14c40dde4a8ae2fb3b37630762eb5572f48 /network/config/bond-with-vlans/controller.yaml
parentc167e9278b5a91957876ad9a204c8af8c208522c (diff)
parentaaca462d9a0fd075e6488bc9686a2b57eb8f9a6a (diff)
Merge "Remove bridge from nic1 in network bond templates"
Diffstat (limited to 'network/config/bond-with-vlans/controller.yaml')
-rw-r--r--network/config/bond-with-vlans/controller.yaml12
1 files changed, 1 insertions, 11 deletions
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
@@ -61,21 +61,11 @@ resources:
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:
-