浏览代码

Allow removal of entries in /etc/hosts

hosts
Filip Pytloun 8 年前
父节点
当前提交
60641d0350
共有 2 个文件被更改,包括 28 次插入5 次删除
  1. +15
    -4
      linux/network/host.sls
  2. +13
    -1
      tests/pillar/network.sls

+ 15
- 4
linux/network/host.sls 查看文件

@@ -5,6 +5,8 @@

{%- if host.names is defined %}

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

linux_host_{{ name }}:
host.present:
- ip: {{ host.address }}
@@ -13,11 +15,11 @@ linux_host_{{ name }}:
{%- if host.address in grains.ipv4 and host.names|length > 1 %}

{%- 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 %}
{%- 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 %}

linux_host_{{ name }}_order_fix:
@@ -33,6 +35,15 @@ linux_host_{{ name }}_order_fix:

{%- endif %}

{%- else %}

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

{%- endif %}

{%- endif %}

{%- endfor %}

+ 13
- 1
tests/pillar/network.sls 查看文件

@@ -22,4 +22,16 @@ linux:
enabled: true
type: vlan
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

正在加载...
取消
保存