Merge pull request #59 from bbinet/pkgs

Prefer "pkgs" rather than "names" when using pkg.installed

linux/network/interface.sls

@@ -13,9 +13,9 @@
 linux_network_bridge_pkgs:
   pkg.installed:
   {%- if network.bridge == 'openvswitch' %}
-  - names: {{ network.ovs_pkgs }}
+  - pkgs: {{ network.ovs_pkgs }}
   {%- else %}
-  - names: {{ network.bridge_pkgs }}
+  - pkgs: {{ network.bridge_pkgs }}
   {%- endif %}
 
 {%- endif %}
@@ -212,7 +212,7 @@ linux_system_network:
 
 linux_network_packages:
   pkg.installed:
-  - names: {{ network.pkgs }}
+  - pkgs: {{ network.pkgs }}
 
 /etc/netctl/network_{{ interface.wireless.essid }}:
   file.managed:

linux/storage/lvm.sls

@@ -4,7 +4,7 @@
 
 linux_lvm_pkgs:
   pkg.installed:
-  - names: {{ storage.lvm_pkgs }}
+  - pkgs: {{ storage.lvm_pkgs }}
 
 {%- for vgname, vg in storage.lvm.iteritems() %}
 

linux/storage/multipath.sls

@@ -3,7 +3,7 @@
 
 linux_storage_multipath_packages:
   pkg.installed:
-  - names: {{ storage.multipath.pkgs }}
+  - pkgs: {{ storage.multipath.pkgs }}
 
 linux_storage_multipath_config:
   file.managed:

linux/system/doc.sls

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

linux/system/kernel.sls

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

linux/system/package.sls

@@ -3,7 +3,7 @@
 
 linux_packages:
   pkg.installed:
-  - names: {{ system.pkgs }}
+  - pkgs: {{ system.pkgs }}
 
 {%- for name, package in system.package.iteritems() %}
 

linux/system/selinux.sls

@@ -27,4 +27,4 @@ selinux_config:
 
 {%- endif %}
 
-{%- endif %}
+{%- endif %}