Browse Source

Fix missing json filter to support salt v2019.2

See salt issues #48309 #51925
pull/189/head
Bruno Binet 5 years ago
parent
commit
6278efc19c
10 changed files with 12 additions and 12 deletions
  1. +1
    -1
      linux/network/dpdk.sls
  2. +3
    -3
      linux/network/interface.sls
  3. +1
    -1
      linux/network/openvswitch.sls
  4. +1
    -1
      linux/storage/lvm.sls
  5. +1
    -1
      linux/storage/mount.sls
  6. +1
    -1
      linux/storage/multipath.sls
  7. +1
    -1
      linux/system/auth.sls
  8. +1
    -1
      linux/system/autoupdates.sls
  9. +1
    -1
      linux/system/package.sls
  10. +1
    -1
      linux/system/repo.sls

+ 1
- 1
linux/network/dpdk.sls View File



linux_dpdk_pkgs: linux_dpdk_pkgs:
pkg.installed: pkg.installed:
- pkgs: {{ network.dpdk_pkgs }}
- pkgs: {{ network.dpdk_pkgs | json }}


linux_dpdk_kernel_module: linux_dpdk_kernel_module:
kmod.present: kmod.present:

+ 3
- 3
linux/network/interface.sls View File

linux_network_bridge_pkgs: linux_network_bridge_pkgs:
pkg.installed: pkg.installed:
{%- if network.bridge == 'openvswitch' %} {%- if network.bridge == 'openvswitch' %}
- pkgs: {{ network.ovs_pkgs }}
- pkgs: {{ network.ovs_pkgs | json }}
{%- else %} {%- else %}
- pkgs: {{ network.bridge_pkgs }}
- pkgs: {{ network.bridge_pkgs | json }}
{%- endif %} {%- endif %}


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


linux_network_packages: linux_network_packages:
pkg.installed: pkg.installed:
- pkgs: {{ network.pkgs }}
- pkgs: {{ network.pkgs | json }}


/etc/netctl/network_{{ interface.wireless.essid }}: /etc/netctl/network_{{ interface.wireless.essid }}:
file.managed: file.managed:

+ 1
- 1
linux/network/openvswitch.sls View File



openvswitch_pkgs: openvswitch_pkgs:
pkg.installed: pkg.installed:
- pkgs: {{ network.ovs_pkgs }}
- pkgs: {{ network.ovs_pkgs | json }}


/etc/default/openvswitch-switch: /etc/default/openvswitch-switch:
file.managed: file.managed:

+ 1
- 1
linux/storage/lvm.sls View File



linux_lvm_pkgs: linux_lvm_pkgs:
pkg.installed: pkg.installed:
- pkgs: {{ storage.lvm_pkgs }}
- pkgs: {{ storage.lvm_pkgs | json }}




/etc/lvm/lvm.conf: /etc/lvm/lvm.conf:

+ 1
- 1
linux/storage/mount.sls View File

{%- if mount.file_system == 'nfs' %} {%- if mount.file_system == 'nfs' %}
linux_storage_nfs_packages: linux_storage_nfs_packages:
pkg.installed: pkg.installed:
- pkgs: {{ storage.nfs.pkgs }}
- pkgs: {{ storage.nfs.pkgs | json }}
{%- endif %} {%- endif %}


{{ mount.path }}: {{ mount.path }}:

+ 1
- 1
linux/storage/multipath.sls View File



linux_storage_multipath_packages: linux_storage_multipath_packages:
pkg.installed: pkg.installed:
- pkgs: {{ storage.multipath.pkgs }}
- pkgs: {{ storage.multipath.pkgs | json }}


linux_storage_multipath_config: linux_storage_multipath_config:
file.managed: file.managed:

+ 1
- 1
linux/system/auth.sls View File



linux_auth_ldap_packages: linux_auth_ldap_packages:
pkg.installed: pkg.installed:
- pkgs: {{ ldap.pkgs }}
- pkgs: {{ ldap.pkgs | json }}


linux_auth_nslcd_config_file: linux_auth_nslcd_config_file:
file.managed: file.managed:

+ 1
- 1
linux/system/autoupdates.sls View File

{%- if system.autoupdates.pkgs %} {%- if system.autoupdates.pkgs %}
linux_autoupdates_packages: linux_autoupdates_packages:
pkg.installed: pkg.installed:
- pkgs: {{ system.autoupdates.pkgs }}
- pkgs: {{ system.autoupdates.pkgs | json }}
{%- endif %} {%- endif %}


{%- if grains.os_family == 'Debian' %} {%- if grains.os_family == 'Debian' %}

+ 1
- 1
linux/system/package.sls View File

{%- if pkgs %} {%- if pkgs %}
linux_extra_packages_{{ pkgs_group }}: linux_extra_packages_{{ pkgs_group }}:
pkg.{{ pkgs_group }}: pkg.{{ pkgs_group }}:
- pkgs: {{ pkgs }}
- pkgs: {{ pkgs | json }}
{%- endif %} {%- endif %}
{%- endfor %} {%- endfor %}



+ 1
- 1
linux/system/repo.sls View File

{% if system.pkgs %} {% if system.pkgs %}
linux_repo_prereq_pkgs: linux_repo_prereq_pkgs:
pkg.installed: pkg.installed:
- pkgs: {{ system.pkgs }}
- pkgs: {{ system.pkgs | json }}
{%- endif %} {%- endif %}


# global proxy setup # global proxy setup

Loading…
Cancel
Save