Get salt version from grains + fix state function name for groupinstall

This commit is contained in:
Aline Freitas 2015-08-14 02:17:07 -03:00
parent 7684d6b0a9
commit aa0314e90d
2 changed files with 2 additions and 2 deletions

View File

@ -22,7 +22,7 @@
}, },
'RedHat': { 'RedHat': {
'apache_utils': 'httpd-tools', 'apache_utils': 'httpd-tools',
'group_action': 'pkg.group_install', 'group_action': 'pkg.group_installed',
'group_pkg': 'Development Tools', 'group_pkg': 'Development Tools',
'libpcre_dev': 'pcre-devel', 'libpcre_dev': 'pcre-devel',
'libssl_dev': 'openssl-devel', 'libssl_dev': 'openssl-devel',

View File

@ -65,7 +65,7 @@ nginx_user:
- makedirs: True - makedirs: True
get-build-tools: get-build-tools:
{% if salt['pkg.version']('salt') < '2015.8.0' and grains['os_family'] == 'RedHat' %} {% if grains['saltversion'] < '2015.8.0' and grains['os_family'] == 'RedHat' %}
module.run: module.run:
- name: pkg.group_install - name: pkg.group_install
- m_name: {{ nginx_map.group_pkg }} - m_name: {{ nginx_map.group_pkg }}