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.confpull/220/head
{%- if network.host|length > 0 or network.get('purge_hosts', True) %} | {%- if network.host|length > 0 or network.get('purge_hosts', True) %} | ||||
- linux.network.host | - linux.network.host | ||||
{%- endif %} | {%- endif %} | ||||
{%- if network.resolv is defined %} | |||||
- linux.network.resolv | |||||
{%- endif %} | |||||
{%- if network.dpdk is defined %} | {%- if network.dpdk is defined %} | ||||
- linux.network.dpdk | - linux.network.dpdk | ||||
{%- endif %} | {%- endif %} | ||||
{%- if network.interface|length > 0 %} | {%- if network.interface|length > 0 %} | ||||
- linux.network.interface | - linux.network.interface | ||||
{%- endif %} | {%- endif %} | ||||
{%- if network.resolv is defined %} | |||||
- linux.network.resolv | |||||
{%- endif %} | |||||
- linux.network.proxy | - linux.network.proxy |
cmd.run: | cmd.run: | ||||
- name: ovs-vsctl add-bond {{ interface.bridge }} {{ interface_name }} {{ interface.slaves }} bond_mode={{ interface.mode }} | - 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 }}.' | - unless: ovs-vsctl show | grep -A 2 'Port.*{{ interface_name }}.' | ||||
- require: | |||||
- require: | |||||
- ovs_bridge_{{ interface.bridge }}_present | - ovs_bridge_{{ interface.bridge }}_present | ||||
{%- elif interface.type == 'ovs_port' %} | {%- elif interface.type == 'ovs_port' %} | ||||
{%- endfor %} | {%- endfor %} | ||||
{%- if interface.gateway is defined %} | |||||
{%- if interface.gateway is defined and network.resolv is not defined %} | |||||
linux_system_network: | linux_system_network: | ||||
network.system: | network.system: |