summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-03-12 18:50:07 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2018-03-12 18:53:06 +0400
commita12266c64987be03998ee9ad663a691fd8b58134 (patch)
tree0f330bc282b3d3e7919e35666c9665f65dcbb417
parent21273a66c4a619a71e1e6bee7a6694cf8bb278d1 (diff)
Update patch with ovs bridges as L3 ifaces
Apply this patch if protocol is set to static to be intended for the ip address settings action only. Change-Id: I758340ff22376c01edd2a9a3555fe0fd9db3f4a9 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
-rw-r--r--mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch b/mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch
index 55cf093f4..e2396de2b 100644
--- a/mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch
+++ b/mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch
@@ -14,18 +14,16 @@ Change-Id: I1e83129cc184cf481bea21d7aa452bf60d9e0499
diff --git a/linux/files/ovs_bridge b/linux/files/ovs_bridge
new file mode 100644
-index 0000000..8c0f468
+index 0000000..575d38f
--- /dev/null
+++ b/linux/files/ovs_bridge
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,12 @@
+auto {{ bridge_name }}
+allow-ovs {{ bridge_name }}
-+iface {{ bridge_name }} inet {{ bridge.get('proto', 'manual') }}
++iface {{ bridge_name }} inet static
+ ovs_type OVSBridge
-+ {%- if bridge.get('proto', 'manual') == 'static' %}
+ address {{ bridge.address }}
+ netmask {{ bridge.netmask }}
-+ {%- endif %}
+ {%- if bridge.gateway is defined %}
+ gateway {{ bridge.gateway }}
+ {%- endif %}
@@ -47,13 +45,14 @@ index 222ca8e..efb0307 100644
mtu {{ port.get('mtu', '1500') }}
ovs_bridge {{ port.bridge }}
diff --git a/linux/network/interface.sls b/linux/network/interface.sls
-index 7375b04..bbf2fa0 100644
+index 3e79847..dc7180a 100644
--- a/linux/network/interface.sls
+++ b/linux/network/interface.sls
-@@ -67,6 +67,32 @@ remove_cloud_init_file:
+@@ -72,6 +72,34 @@ remove_cloud_init_file:
ovs_bridge_{{ interface_name }}:
openvswitch_bridge.present:
- name: {{ interface_name }}
++{%- if interface.get('proto', 'manual') == 'static' %}
+ file.managed:
+ - name: /etc/network/interfaces.u/ifcfg-{{ interface_name }}
+ - makedirs: True
@@ -80,6 +79,7 @@ index 7375b04..bbf2fa0 100644
+ - file: linux_interfaces_final_include
+ - unless:
+ - ip link show {{ interface_name }} | grep -q '\<UP\>'
++{%- endif %}
{# add linux network interface into OVS bridge #}
{%- for int_name, int in network.interface.items() %}