Bladeren bron

Merge pull request #189 from bbinet/fix-salt-v2019.2

Fix missing json filter to support salt v2019.2
pull/185/merge
Filip Pytloun 5 jaren geleden
bovenliggende
commit
f955e090d8
No account linked to committer's email address
10 gewijzigde bestanden met toevoegingen van 12 en 12 verwijderingen
  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 Bestand weergeven

@@ -4,7 +4,7 @@

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

linux_dpdk_kernel_module:
kmod.present:

+ 3
- 3
linux/network/interface.sls Bestand weergeven

@@ -19,9 +19,9 @@ include:
linux_network_bridge_pkgs:
pkg.installed:
{%- if network.bridge == 'openvswitch' %}
- pkgs: {{ network.ovs_pkgs }}
- pkgs: {{ network.ovs_pkgs | json }}
{%- else %}
- pkgs: {{ network.bridge_pkgs }}
- pkgs: {{ network.bridge_pkgs | json }}
{%- endif %}

{%- endif %}
@@ -375,7 +375,7 @@ linux_system_network:

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

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

+ 1
- 1
linux/network/openvswitch.sls Bestand weergeven

@@ -4,7 +4,7 @@

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

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

+ 1
- 1
linux/storage/lvm.sls Bestand weergeven

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

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


/etc/lvm/lvm.conf:

+ 1
- 1
linux/storage/mount.sls Bestand weergeven

@@ -27,7 +27,7 @@ xfs_packages_{{ mount.device }}:
{%- if mount.file_system == 'nfs' %}
linux_storage_nfs_packages:
pkg.installed:
- pkgs: {{ storage.nfs.pkgs }}
- pkgs: {{ storage.nfs.pkgs | json }}
{%- endif %}

{{ mount.path }}:

+ 1
- 1
linux/storage/multipath.sls Bestand weergeven

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

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

linux_storage_multipath_config:
file.managed:

+ 1
- 1
linux/system/auth.sls Bestand weergeven

@@ -173,7 +173,7 @@ linux_auth_nsswitch_config_file:

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

linux_auth_nslcd_config_file:
file.managed:

+ 1
- 1
linux/system/autoupdates.sls Bestand weergeven

@@ -6,7 +6,7 @@
{%- if system.autoupdates.pkgs %}
linux_autoupdates_packages:
pkg.installed:
- pkgs: {{ system.autoupdates.pkgs }}
- pkgs: {{ system.autoupdates.pkgs | json }}
{%- endif %}

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

+ 1
- 1
linux/system/package.sls Bestand weergeven

@@ -51,7 +51,7 @@ linux_extra_package_{{ name }}:
{%- if pkgs %}
linux_extra_packages_{{ pkgs_group }}:
pkg.{{ pkgs_group }}:
- pkgs: {{ pkgs }}
- pkgs: {{ pkgs | json }}
{%- endif %}
{%- endfor %}


+ 1
- 1
linux/system/repo.sls Bestand weergeven

@@ -4,7 +4,7 @@
{% if system.pkgs %}
linux_repo_prereq_pkgs:
pkg.installed:
- pkgs: {{ system.pkgs }}
- pkgs: {{ system.pkgs | json }}
{%- endif %}

# global proxy setup

Laden…
Annuleren
Opslaan