From 91af5ac557564648378dab150e4537da166fd286 Mon Sep 17 00:00:00 2001 From: Dan Sneddon Date: Mon, 17 Aug 2015 14:08:08 -0700 Subject: 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 --- network/config/bond-with-vlans/compute.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit 1.2.3-korg