commit 585d38bf15dd1b34bb88fdf0a5b09735bdba2fdd
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Mar 13 12:57:15 2019 +0000
committer Gerrit Code Review <mail@domain.com> Wed Mar 13 12:57:15 2019 +0000
tree 379bfc93f308fd42eba46177a295490f86c125ce
parent dbaecb2215f301d5a6e358519b6b86030276cf33
parent 295ee1bdac196af08159e7be4c0df5023bc538b3

Merge "Ensure resolv.conf is a straight symlink" into release/2019.2.0

linux/network/interface.sls

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 %}