Make ifdown before interface changes on ipflush
Change-Id: I4397e9e82f8d4114ced50ff253679a8f27762c17
Closes-Bug: PROD-22473
diff --git a/linux/network/interface.sls b/linux/network/interface.sls
index 771bd5e..d55df29 100644
--- a/linux/network/interface.sls
+++ b/linux/network/interface.sls
@@ -389,31 +389,32 @@
{%- endif %}
{%- if interface.type in ('eth','ovs_port') %}
-{%- if interface.get('ipflush_onchange', False) %}
+ {%- if interface.get('restart_on_ipflush', False) %}
+linux_interface_down_on_ipflush_{{ interface_name }}:
+ cmd.run:
+ - name: ifdown {{ interface_name }}
+ - prereq:
+ - network: linux_interface_{{ interface_name }}
+
+linux_interface_up_on_ipflush_{{ interface_name }}:
+ cmd.run:
+ - name: ifup {{ interface_name }}
+ - onchanges:
+ - network: linux_interface_{{ interface_name }}
+
+ {%- elif interface.get('ipflush_onchange', False)%}
linux_interface_ipflush_onchange_{{ interface_name }}:
cmd.run:
- name: "/sbin/ip address flush dev {{ interface_name }}"
-{%- if interface.type == 'eth' %}
- onchanges:
+ {%- if interface.type == 'eth' %}
- network: linux_interface_{{ interface_name }}
-{%- elif interface.type == 'ovs_port' %}
- - onchanges:
+ {%- else %}
- file: ovs_port_{{ interface_name }}
-{%- endif %}
+ {%- endif %}
-{%- if interface.get('restart_on_ipflush', False) %}
-
-linux_interface_restart_on_ipflush_{{ interface_name }}:
- cmd.run:
- - name: "ifdown {{ interface_name }}; ifup {{ interface_name }};"
- - onchanges:
- - cmd: linux_interface_ipflush_onchange_{{ interface_name }}
-
-{%- endif %}
-
-{%- endif %}
-
+ {%- endif %}
{%- endif %}
{%- endfor %}