Browse Source

Allow removal of entries in /etc/hosts

hosts
Filip Pytloun 8 years ago
parent
commit
60641d0350
2 changed files with 28 additions and 5 deletions
  1. +15
    -4
      linux/network/host.sls
  2. +13
    -1
      tests/pillar/network.sls

+ 15
- 4
linux/network/host.sls View File



{%- if host.names is defined %} {%- if host.names is defined %}


{%- if host.get('enabled', True) %}

linux_host_{{ name }}: linux_host_{{ name }}:
host.present: host.present:
- ip: {{ host.address }} - ip: {{ host.address }}
{%- if host.address in grains.ipv4 and host.names|length > 1 %} {%- if host.address in grains.ipv4 and host.names|length > 1 %}


{%- if host.names.1 in host.names.0 %} {%- if host.names.1 in host.names.0 %}
{%- set before = host.names.1 + " " + host.names.0 %}
{%- set after = host.names.0 + " " + host.names.1 %}
{%- set before = host.names.1 + " " + host.names.0 %}
{%- set after = host.names.0 + " " + host.names.1 %}
{%- elif host.names.0 in host.names.1 %} {%- elif host.names.0 in host.names.1 %}
{%- set before = host.names.0 + " " + host.names.1 %}
{%- set after = host.names.1 + " " + host.names.0 %}
{%- set before = host.names.0 + " " + host.names.1 %}
{%- set after = host.names.1 + " " + host.names.0 %}
{%- endif %} {%- endif %}


linux_host_{{ name }}_order_fix: linux_host_{{ name }}_order_fix:


{%- endif %} {%- endif %}


{%- else %}

linux_host_{{ name }}_absent:
host.absent:
- ip: {{ host.address }}
- names: {{ host.names }}

{%- endif %}

{%- endif %} {%- endif %}


{%- endfor %} {%- endfor %}

+ 13
- 1
tests/pillar/network.sls View File

enabled: true enabled: true
type: vlan type: vlan
use_interfaces: use_interfaces:
- interface: ${linux:interface:eth0}
- interface: ${linux:interface:eth0}
host:
localhost:
address: 127.0.1.1
names:
- localhost.localdomain
- localhost
removed:
enabled: false
address: 127.0.1.6
names:
- removed.domain
- removed

Loading…
Cancel
Save