浏览代码

Incoporate the changes suggested by @bechtoldt

Signed-off-by: René Jochum <rene@jochums.at>
pull/9/head
René Jochum 9 年前
父节点
当前提交
05132786d2
共有 2 个文件被更改,包括 5 次插入3 次删除
  1. +3
    -2
      network/interfaces.sls
  2. +2
    -1
      network/packages.sls

+ 3
- 2
network/interfaces.sls 查看文件

@@ -12,9 +12,10 @@
{%- endif -%}
{%- endmacro -%}

{%- if 'dhclient_conf' in salt['pillar.get']('network') %}
{%- if salt['pillar.get']('network:dhclient_conf', False) %}
dhclient_conf:
file.managed:
file:
- managed
- name: /etc/dhcp/dhclient.conf
- mode: 644
- user: root

+ 2
- 1
network/packages.sls 查看文件

@@ -2,6 +2,7 @@

{% for action, pkgs in salt['pillar.get']('network:pkgs', {}).iteritems() %}
network_pkgs_{{ action }}:
pkg.{{ action }}:
pkg:
- {{ action }}
- pkgs: {{ pkgs }}
{% endfor %}

正在加载...
取消
保存