Browse Source

Incoporate the changes suggested by @bechtoldt

Signed-off-by: René Jochum <rene@jochums.at>
pull/9/head
René Jochum 9 years ago
parent
commit
05132786d2
2 changed files with 5 additions and 3 deletions
  1. +3
    -2
      network/interfaces.sls
  2. +2
    -1
      network/packages.sls

+ 3
- 2
network/interfaces.sls View File

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


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

+ 2
- 1
network/packages.sls View File



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

Loading…
Cancel
Save