Fix for bm deployment with dhcp on bridges
Prod related: PROD-29044
Change-Id: Id1ae8234c5298565d60df5cfbfbb73f019b18e3c
diff --git a/linux/network/interface.sls b/linux/network/interface.sls
index 38b486e..ff8bc6a 100644
--- a/linux/network/interface.sls
+++ b/linux/network/interface.sls
@@ -66,6 +66,12 @@
- watch:
- file: remove_cloud_init_file
+networking_wait:
+ module.wait:
+ - name: test.ping
+ - watch:
+ - service: networking
+
{%- endif %}
{%- for interface_name, interface in network.interface.items() %}
@@ -402,7 +408,7 @@
{%- endif %}
-{%- if interface.type in ('eth','ovs_port') %}
+{%- if interface.type in ('eth','ovs_port','bridge') %}
{%- if interface.get('ifdown_before_changes', False) %}
linux_interface_down_before_change_{{ interface_name }}:
@@ -430,7 +436,7 @@
linux_interface_ipflush_onchange_{{ interface_name }}:
cmd.run:
- name: "/sbin/ip address flush dev {{ interface_name }}"
- {%- if interface.type == 'eth' %}
+ {%- if interface.type in ('eth','bridge') %}
- onchanges:
- network: linux_interface_{{ interface_name }}
{%- elif interface.type == 'ovs_port' %}