Network resolf.conf handling

the handling as the Resolv.conf is generated and adapted, adapted.
previously the Resolv.conf was created and then through
Overwrite "network.system" in the interface.sls again.
With two search servers that should actually be included.
"search example.com. sudomain.example.com"
but it always became that
search ['example.com.', 'sudomain.example.com']

The resolv.conf was first created correctly but then overwritten again in the interface.sls.

The problem only arises if you don't want to have a "Domain:" in resov.conf

linux/network/init.sls

@@ -6,9 +6,6 @@ include:
 {%- if network.host|length > 0 or network.get('purge_hosts', True) %}
 - linux.network.host
 {%- endif %}
-{%- if network.resolv is defined %}
-- linux.network.resolv
-{%- endif %}
 {%- if network.dpdk is defined %}
 - linux.network.dpdk
 {%- endif %}
@@ -24,4 +21,7 @@ include:
 {%- if network.interface|length > 0 %}
 - linux.network.interface
 {%- endif %}
+{%- if network.resolv is defined %}
+- linux.network.resolv
+{%- endif %}
 - linux.network.proxy

linux/network/interface.sls

@@ -173,7 +173,7 @@ ovs_bond_{{ interface_name }}:
   cmd.run:
     - name: ovs-vsctl add-bond {{ interface.bridge }} {{ interface_name }} {{ interface.slaves }} bond_mode={{ interface.mode }}
     - unless: ovs-vsctl show | grep -A 2 'Port.*{{ interface_name }}.'
-    - require: 
+    - require:
       - ovs_bridge_{{ interface.bridge }}_present
 
 {%- elif interface.type == 'ovs_port' %}
@@ -349,7 +349,7 @@ remove_interface_{{ network }}_line2:
 
 {%- endfor %}
 
-{%- if interface.gateway is defined %}
+{%- if interface.gateway is defined and network.resolv is not defined %}
 
 linux_system_network:
   network.system: