Browse Source

Merge pull request #59 from bbinet/pkgs

Prefer "pkgs" rather than "names" when using pkg.installed
tags/2017.4
Filip Pytloun 7 years ago
parent
commit
6b2bb967c6
7 changed files with 9 additions and 9 deletions
  1. +3
    -3
      linux/network/interface.sls
  2. +1
    -1
      linux/storage/lvm.sls
  3. +1
    -1
      linux/storage/multipath.sls
  4. +1
    -1
      linux/system/doc.sls
  5. +1
    -1
      linux/system/kernel.sls
  6. +1
    -1
      linux/system/package.sls
  7. +1
    -1
      linux/system/selinux.sls

+ 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' %}
- names: {{ network.ovs_pkgs }}
- pkgs: {{ network.ovs_pkgs }}
{%- else %} {%- else %}
- names: {{ network.bridge_pkgs }}
- pkgs: {{ network.bridge_pkgs }}
{%- endif %} {%- endif %}


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


linux_network_packages: linux_network_packages:
pkg.installed: pkg.installed:
- names: {{ network.pkgs }}
- pkgs: {{ network.pkgs }}


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

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



linux_lvm_pkgs: linux_lvm_pkgs:
pkg.installed: pkg.installed:
- names: {{ storage.lvm_pkgs }}
- pkgs: {{ storage.lvm_pkgs }}


{%- for vgname, vg in storage.lvm.iteritems() %} {%- for vgname, vg in storage.lvm.iteritems() %}



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



linux_storage_multipath_packages: linux_storage_multipath_packages:
pkg.installed: pkg.installed:
- names: {{ storage.multipath.pkgs }}
- pkgs: {{ storage.multipath.pkgs }}


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

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



linux_system_doc_validity_check: linux_system_doc_validity_check:
pkg.installed: pkg.installed:
- names: {{ system.doc_validity_pkgs }}
- pkgs: {{ system.doc_validity_pkgs }}
cmd.wait: cmd.wait:
- name: python -c "import yaml; stream = file('/etc/salt/grains.d/sphinx', 'r'); yaml.load(stream); stream.close()" - name: python -c "import yaml; stream = file('/etc/salt/grains.d/sphinx', 'r'); yaml.load(stream); stream.close()"
- require: - require:

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



linux_kernel_package: linux_kernel_package:
pkg.installed: pkg.installed:
- names:
- pkgs:
- linux-image-{{ system.kernel.version }}-{{ system.kernel.type|default('generic') }} - linux-image-{{ system.kernel.version }}-{{ system.kernel.type|default('generic') }}
{%- if system.kernel.get('headers', False) %} {%- if system.kernel.get('headers', False) %}
- linux-headers-{{ system.kernel.version }}-{{ system.kernel.type|default('generic') }} - linux-headers-{{ system.kernel.version }}-{{ system.kernel.type|default('generic') }}

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



linux_packages: linux_packages:
pkg.installed: pkg.installed:
- names: {{ system.pkgs }}
- pkgs: {{ system.pkgs }}


{%- for name, package in system.package.iteritems() %} {%- for name, package in system.package.iteritems() %}



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



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


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

Loading…
Cancel
Save