Merge pull request #29 from obourdon/stacklight

Fixes for idempotence

linux/network/host.sls

@@ -28,6 +28,8 @@ linux_host_{{ name }}_order_fix:
     - repl: {{ after }}
     - watch:
       - host: linux_host_{{ name }}
+    - onlyif:
+      - grep -q "{{ before }}" /etc/hosts
 
 {%- endif %}
 
@@ -35,4 +37,4 @@ linux_host_{{ name }}_order_fix:
 
 {%- endfor %}
 
-{%- endif %}
+{%- endif %}

linux/network/interface.sls

@@ -88,6 +88,7 @@ linux_interface_{{ interface_name }}:
   - type: {{ interface.type }}
   {%- if interface.address is defined %}
   {%- if grains.os_family == 'Debian' %}
+  - unless: grep -q "iface {{ interface_name }} " /etc/network/interfaces
   - proto: {{ interface.get('proto', 'static') }}
   {% endif %}
   {%- if grains.os_family == 'RedHat' %}