瀏覽代碼

fixing a wrong usage of var tests

tags/v0.1
Arnold Bechtoldt 10 年之前
父節點
當前提交
76e8f88067
共有 2 個檔案被更改,包括 7 行新增7 行删除
  1. +1
    -1
      network/interfaces.sls
  2. +6
    -6
      network/resolver.sls

+ 1
- 1
network/interfaces.sls 查看文件

@@ -3,7 +3,7 @@

{% set interfaces = datamap['default_interfaces'] %}

{% if salt['pillar.get']('network:interfaces') is defined %}
{% if salt['pillar.get']('network:interfaces', False) %}
{% set interfaces = interfaces + salt['pillar.get']('network:interfaces') %}
{% endif %}


+ 6
- 6
network/resolver.sls 查看文件

@@ -9,23 +9,23 @@ resolver:
- user: root
- group: root
- contents: |
{%- if salt['pillar.get']('network:resolver:file_prepend') is defined %}
{%- if salt['pillar.get']('network:resolver:file_prepend', False) %}
{{ salt['pillar.get']('network:resolver:file_prepend') }}
{%- endif -%}
{% if salt['pillar.get']('network:resolver:domain') is defined %}
{% if salt['pillar.get']('network:resolver:domain', False) %}
domain: {{ salt['pillar.get']('network:resolver:domain') }}
{%- endif -%}
{%- if salt['pillar.get']('network:resolver:search') is defined %}
{%- if salt['pillar.get']('network:resolver:search', False) %}
search: {{ salt['pillar.get']('network:resolver:search') }}
{%- endif -%}
{%- if salt['pillar.get']('network:resolver:nameservers') is defined -%}
{%- if salt['pillar.get']('network:resolver:nameservers', False) -%}
{%- for n in salt['pillar.get']('network:resolver:nameservers') %}
nameserver: {{ n }}
{%- endfor -%}
{%- endif -%}
{%- if salt['pillar.get']('network:resolver:options') is defined %}
{%- if salt['pillar.get']('network:resolver:options', False) %}
options: {{ salt['pillar.get']('network:resolver:options')|join(' ') }}
{%- endif -%}
{%- if salt['pillar.get']('network:resolver:file_append') is defined %}
{%- if salt['pillar.get']('network:resolver:file_append', False) %}
{{ salt['pillar.get']('network:resolver:file_append') }}
{%- endif %}

Loading…
取消
儲存