aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Sneddon <dsneddon@redhat.com>2015-08-17 14:08:08 -0700
committerDan Sneddon <dsneddon@redhat.com>2015-08-17 14:08:08 -0700
commit91af5ac557564648378dab150e4537da166fd286 (patch)
treea8d4e9feda216c25950754a9dad09fe3ce6037ad
parente96c087509193d5ad63caa3014977a2baf0db0d3 (diff)
Remove hardcoded bridge name in bonded compute NIC config
This change removes a hardcoded value for the bond name in the NIC config for the compute node in the bond-with-vlan NIC config templates. When this hardcoded value of "br-bond" is used, then the Neutron bridge mappings must be set to set to datacentre:br-bond in order for VLAN mode networking to recognize the bridge. By using the input value for bridge_name we will ensure that the controller and compute nodes have the same bridge name (defaults to "br-ex"), and that the defaults will work with VLAN mode. Change-Id: I28654ab93e3c10a8597c8b877f3f2f6b3eca887c
-rw-r--r--network/config/bond-with-vlans/compute.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/network/config/bond-with-vlans/compute.yaml b/network/config/bond-with-vlans/compute.yaml
index 5105ee14..3a46a48d 100644
--- a/network/config/bond-with-vlans/compute.yaml
+++ b/network/config/bond-with-vlans/compute.yaml
@@ -53,7 +53,7 @@ resources:
network_config:
-
type: ovs_bridge
- name: br-bond
+ name: {get_input: bridge_name}
members:
-
type: ovs_bond