Merge "Add telegraf label" into release/2019.2.0
diff --git a/linux/network/interface.sls b/linux/network/interface.sls
index 771bd5e..2cfdb3b 100644
--- a/linux/network/interface.sls
+++ b/linux/network/interface.sls
@@ -104,8 +104,8 @@
add_int_{{ int_name }}_to_ovs_bridge_{{ interface_name }}:
cmd.run:
- - unless: ovs-vsctl show | grep {{ int_name }}
- name: ovs-vsctl{%- if network.ovs_nowait %} --no-wait{%- endif %} add-port {{ interface_name }} {{ int_name }}
+ - unless: ovs-vsctl list-ports {{ interface_name }} | grep -qFx {{ int_name }}
{%- endif %}
{%- endfor %}
diff --git a/linux/network/resolv.sls b/linux/network/resolv.sls
index 965ed2f..bac6ebf 100644
--- a/linux/network/resolv.sls
+++ b/linux/network/resolv.sls
@@ -11,6 +11,11 @@
- require:
- pkg: resolvconf
+ensure_resolvconf_symlink:
+ cmd.run:
+ - name: dpkg-reconfigure -fnoninteractive resolvconf
+ - unless: test -L /etc/resolv.conf
+
{%- if network.resolv is defined %}
/etc/resolvconf/resolv.conf.d/base:
file.managed: