Merge pull request #59 from bbinet/pkgs
Prefer "pkgs" rather than "names" when using pkg.installed
diff --git a/linux/network/interface.sls b/linux/network/interface.sls
index 0fda106..f42cc53 100644
--- a/linux/network/interface.sls
+++ b/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_network_packages:
pkg.installed:
- - names: {{ network.pkgs }}
+ - pkgs: {{ network.pkgs }}
/etc/netctl/network_{{ interface.wireless.essid }}:
file.managed:
diff --git a/linux/storage/lvm.sls b/linux/storage/lvm.sls
index 13f0e84..0126e32 100644
--- a/linux/storage/lvm.sls
+++ b/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() %}
diff --git a/linux/storage/multipath.sls b/linux/storage/multipath.sls
index 6bcadd1..dc59d9f 100644
--- a/linux/storage/multipath.sls
+++ b/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:
diff --git a/linux/system/doc.sls b/linux/system/doc.sls
index f499516..64c9d0a 100644
--- a/linux/system/doc.sls
+++ b/linux/system/doc.sls
@@ -19,7 +19,7 @@
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:
diff --git a/linux/system/kernel.sls b/linux/system/kernel.sls
index d1ebb9f..035f1e0 100644
--- a/linux/system/kernel.sls
+++ b/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') }}
diff --git a/linux/system/package.sls b/linux/system/package.sls
index f4cd07e..9bda3a2 100644
--- a/linux/system/package.sls
+++ b/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() %}
diff --git a/linux/system/selinux.sls b/linux/system/selinux.sls
index a91ed2e..d9cba32 100644
--- a/linux/system/selinux.sls
+++ b/linux/system/selinux.sls
@@ -27,4 +27,4 @@
{%- endif %}
-{%- endif %}
\ No newline at end of file
+{%- endif %}