commit c04b9b3557c5d73530a99d0a5ac7506f81640c13
author Thomas Rehn <thomas.rehn@initos.com> Wed Sep 20 13:27:02 2017 +0200
committer Thomas Rehn <thomas.rehn@initos.com> Wed Sep 20 13:27:02 2017 +0200
tree bef78301742375fdb68e4a2f68b2bee81a26ce01
parent 995e8850d8f45f6ef369bad804629bbec72002c1

Fix: output of net-list may start with whitespace

libvirt/server/network.sls

diff --git a/libvirt/server/network.sls b/libvirt/server/network.sls
index f68ee95..e4a8d4e 100644
--- a/libvirt/server/network.sls
+++ b/libvirt/server/network.sls
@@ -24,7 +24,7 @@
 net-{{ name }}:
   cmd.run:
   - name: virsh net-define {{ network_config_file }}
-  - unless: virsh -q net-list --all | grep -q '^{{ name }}'
+  - unless: virsh -q net-list --all | grep -q '^\s*{{ name }}'
 
 {%- if network.autostart|default(True) %}
 
@@ -38,7 +38,7 @@
 net-startstop-{{ name }}:
   cmd.run:
   - name: virsh net-start {{ name }}
-  - unless: virsh -q net-list --all | grep -Eq '^{{ name }}\s+active'
+  - unless: virsh -q net-list --all | grep -Eq '^\s*{{ name }}\s+active'
 
 {%- endif %}
 
@@ -52,7 +52,7 @@
 net-{{ name }}:
   cmd.run:
   - name: virsh net-destroy {{ name }} 2>&1 1>/dev/null; virsh net-undefine {{ name }}
-  - onlyif: virsh -q net-list --all | grep -q '^{{ name }}'
+  - onlyif: virsh -q net-list --all | grep -q '^\s*{{ name }}'
 
 net-autostart-{{ name }}:
   cmd.run:
@@ -62,7 +62,7 @@
 net-startstop-{{ name }}:
   cmd.run:
   - name: virsh net-destroy {{ name }}
-  - onlyif: virsh -q net-list --all | grep -Eq '^{{ name }}\s+active'
+  - onlyif: virsh -q net-list --all | grep -Eq '^\s*{{ name }}\s+active'
 
 {%- endif %}