Set linux:network:bridge = openvswitch for OVS-based interfaces
Automatically set bridge type depending on interface role.
Doesn't support 'linux' bridge type at the moments, because
the salt-formula-linux don't support multiple bridge types
at the moment.
Change-Id: Icbf4a8235bb5e188831a158655f52473a440b929
diff --git "a/\173\043 interfaces \043\175/bond0_ab_contrail" "b/\173\043 interfaces \043\175/bond0_ab_contrail"
index 37b9d58..78be21a 100644
--- "a/\173\043 interfaces \043\175/bond0_ab_contrail"
+++ "b/\173\043 interfaces \043\175/bond0_ab_contrail"
@@ -1,5 +1,4 @@
{#- Provides: #}
-{#- br_mesh (linux bridge) + tenant address #}
{#- vhost0 , as a keepalived vip interface #}
{#- Requirements: #}
{#- _param:tenant_vlan #}
diff --git "a/\173\043 interfaces \043\175/bond0_ab_dvr_vlan_ctl_prv_floating" "b/\173\043 interfaces \043\175/bond0_ab_dvr_vlan_ctl_prv_floating"
index cbc1232..3e175e6 100644
--- "a/\173\043 interfaces \043\175/bond0_ab_dvr_vlan_ctl_prv_floating"
+++ "b/\173\043 interfaces \043\175/bond0_ab_dvr_vlan_ctl_prv_floating"
@@ -8,6 +8,7 @@
{#- _param:control_network_netmask #}
{#- _param:control_vlan #}
# {{ interfaces_role }}
+ {{- set_param('linux_network_bridge', 'openvswitch') }}
{%- for interface_name, interface in interfaces.items() %}
{{ interface_name }}:
mtu: 9000
diff --git "a/\173\043 interfaces \043\175/bond0_ab_dvr_vxlan_ctl_mesh_floating" "b/\173\043 interfaces \043\175/bond0_ab_dvr_vxlan_ctl_mesh_floating"
index c113f14..c775a6b 100644
--- "a/\173\043 interfaces \043\175/bond0_ab_dvr_vxlan_ctl_mesh_floating"
+++ "b/\173\043 interfaces \043\175/bond0_ab_dvr_vxlan_ctl_mesh_floating"
@@ -11,6 +11,7 @@
{#- _param:tenant_netmask #}
{#- _param:tenant_vlan #}
# {{ interfaces_role }}
+ {{- set_param('linux_network_bridge', 'openvswitch') }}
{%- for interface_name, interface in interfaces.items() %}
{{ interface_name }}:
mtu: 9000
diff --git "a/\173\043 interfaces \043\175/bond0_ab_nondvr_vlan_ctl_prv" "b/\173\043 interfaces \043\175/bond0_ab_nondvr_vlan_ctl_prv"
index 2287752..286b36f 100644
--- "a/\173\043 interfaces \043\175/bond0_ab_nondvr_vlan_ctl_prv"
+++ "b/\173\043 interfaces \043\175/bond0_ab_nondvr_vlan_ctl_prv"
@@ -7,6 +7,7 @@
{#- _param:control_network_netmask #}
{#- _param:control_vlan #}
# {{ interfaces_role }}
+ {{- set_param('linux_network_bridge', 'openvswitch') }}
{%- for interface_name, interface in interfaces.items() %}
{{ interface_name }}:
mtu: 9000
diff --git "a/\173\043 interfaces \043\175/bond0_ab_ovs_vlan_ctl_prv" "b/\173\043 interfaces \043\175/bond0_ab_ovs_vlan_ctl_prv"
index eb3826e..7c9ec51 100644
--- "a/\173\043 interfaces \043\175/bond0_ab_ovs_vlan_ctl_prv"
+++ "b/\173\043 interfaces \043\175/bond0_ab_ovs_vlan_ctl_prv"
@@ -7,6 +7,7 @@
{#- _param:control_network_netmask #}
{#- _param:control_vlan #}
# {{ interfaces_role }}
+ {{- set_param('linux_network_bridge', 'openvswitch') }}
{%- for interface_name, interface in interfaces.items() %}
{{ interface_name }}:
mtu: 9000
diff --git "a/\173\043 interfaces \043\175/bond0_ab_ovs_vxlan_ctl_mesh" "b/\173\043 interfaces \043\175/bond0_ab_ovs_vxlan_ctl_mesh"
index 5ec9ddc..7ff1ded 100644
--- "a/\173\043 interfaces \043\175/bond0_ab_ovs_vxlan_ctl_mesh"
+++ "b/\173\043 interfaces \043\175/bond0_ab_ovs_vxlan_ctl_mesh"
@@ -10,6 +10,7 @@
{#- _param:tenant_netmask #}
{#- _param:tenant_vlan #}
# {{ interfaces_role }}
+ {{- set_param('linux_network_bridge', 'openvswitch') }}
{%- for interface_name, interface in interfaces.items() %}
{{ interface_name }}:
mtu: 9000
diff --git "a/\173\043 interfaces \043\175/bond1_ab_ovs_floating" "b/\173\043 interfaces \043\175/bond1_ab_ovs_floating"
index f85af26..72c5092 100644
--- "a/\173\043 interfaces \043\175/bond1_ab_ovs_floating"
+++ "b/\173\043 interfaces \043\175/bond1_ab_ovs_floating"
@@ -6,6 +6,7 @@
{#- _param:?mask #}
{#- _param:?vlan #}
# {{ interfaces_role }}
+ {{- set_param('linux_network_bridge', 'openvswitch') }}
{%- for interface_name, interface in interfaces.items() %}
{{ interface_name }}:
mtu: 9000
diff --git "a/\173\043 interfaces \043\175/bond2_dpdk_prv" "b/\173\043 interfaces \043\175/bond2_dpdk_prv"
index 0ba4aa3..03dcba9 100644
--- "a/\173\043 interfaces \043\175/bond2_dpdk_prv"
+++ "b/\173\043 interfaces \043\175/bond2_dpdk_prv"
@@ -4,6 +4,7 @@
{#- _param:tenant_address #}
{#- _param:tenant_network_netmask #}
# {{ interfaces_role }}
+ {{- set_param('linux_network_bridge', 'openvswitch') }}
{%- for interface_name, interface in interfaces.items() %}
{{ interface_name }}:
bond: bonddpdk2
diff --git "a/\173\043 interfaces \043\175/single_ovs_br_floating" "b/\173\043 interfaces \043\175/single_ovs_br_floating"
index 644186e..9ac7c73 100644
--- "a/\173\043 interfaces \043\175/single_ovs_br_floating"
+++ "b/\173\043 interfaces \043\175/single_ovs_br_floating"
@@ -1,5 +1,6 @@
{#- Public network. For gateway nodes and computes with dvr #}
# {{ interfaces_role }}
+ {{- set_param('linux_network_bridge', 'openvswitch') }}
{%- set interface_name = interfaces.keys()[0] %}
{{ interface_name }}:
enabled: true
diff --git "a/\173\043 interfaces \043\175/single_ovs_br_prv" "b/\173\043 interfaces \043\175/single_ovs_br_prv"
index 17645e6..3fe4b2b 100644
--- "a/\173\043 interfaces \043\175/single_ovs_br_prv"
+++ "b/\173\043 interfaces \043\175/single_ovs_br_prv"
@@ -1,5 +1,6 @@
{#- Tenant over VLAN. For computes with dedicated physical interface for tenant networks. #}
# {{ interfaces_role }}
+ {{- set_param('linux_network_bridge', 'openvswitch') }}
{%- set interface_name = interfaces.keys()[0] %}
{{ interface_name }}:
enabled: true
diff --git "a/\173\173 cookiecutter._env_name \175\175/linux_network_interface.yml" "b/\173\173 cookiecutter._env_name \175\175/linux_network_interface.yml"
index 8474d17..7aa8dd6 100644
--- "a/\173\173 cookiecutter._env_name \175\175/linux_network_interface.yml"
+++ "b/\173\173 cookiecutter._env_name \175\175/linux_network_interface.yml"
@@ -1,6 +1,8 @@
parameters:
- # _param:
- # Put overrides for any environment-specific variables here
+ _param:
+ # Put overrides for any environment-specific variables here
+ linux_network_bridge: 'none'
linux:
network:
+ bridge: ${_param:linux_network_bridge}
interface: ${_param:linux_network_interfaces}