Merge pull request #42 from mceloud/master

fix options setting in resolv

README.rst

@@ -545,6 +545,10 @@ Setup resolv.conf, nameservers, domain and search domains
           search:
             - my.example.com
             - example.com
+          options:
+            - ndots:5
+            - timeout:2
+            - attempts:2
 
 Linux storage pillars
 ---------------------

linux/files/resolv.conf

@@ -10,5 +10,7 @@ domain {{ network.resolv.domain }}
 nameserver {{ nameserver }}
 {%- endfor %}
 {%- if network.resolv.get('options', False) %}
-options {{ options|sort|join(' ') }}
+{%- for option in network.resolv.options %}
+options {{ option }}
+{%- endfor %}
 {%- endif %}