Merge pull request #1 from myoung34/master

Use `os_family` instead of `os` for better deritivate catching

Author: JulioECastro

node/map.jinja

@@ -31,7 +31,7 @@
     },
 }, grain='os', merge=pillar_get('node:lookup')) %}
 
-{% if pillar_get('node:install_from_source') or (grains['os'] == 'Debian' and grains['osrelease']|float < 8 and not pillar_get('node:install_from_ppa')) %}
+{% if pillar_get('node:install_from_source') or (grains['os_family'] == 'Debian' and grains['osrelease']|float < 8 and not pillar_get('node:install_from_ppa')) %}
   {% set npm_requirement = npm_src_requirement %}
 {% else %}
   {% set npm_requirement = 'pkg: {0}'.format(node['npm_pkg']) %}

node/pkg.sls

@@ -1,6 +1,6 @@
 {%- from "node/map.jinja" import node, npm_bin with context %}
 
-{%- if grains['os'] in ['Ubuntu', 'Debian'] and salt['pillar.get']('node:install_from_ppa') %}
+{%- if grains['os_family'] in ['Ubuntu', 'Debian'] and salt['pillar.get']('node:install_from_ppa') %}
 nodejs.ppa:
   pkg.installed:
     - name: apt-transport-https

node/source.sls

@@ -16,7 +16,7 @@ Ensure required packages are present:
   pkg.installed:
     - names: {{ from_src_requirements.pkgs|json }}
 
-{% if grains['os'] in ['RedHat', 'CentOS'] %}
+{% if grains['os_family'] in ['RedHat', 'CentOS'] %}
 Alternative checkinstall requirement:
   pkg.installed:
     - pkgs:
@@ -54,7 +54,7 @@ make-node:
     - cwd: /usr/src/node-v{{ version }}
     - name: make --jobs={{ make_jobs }}
 
-{% if grains['os'] in ['RedHat', 'CentOS'] %}
+{% if grains['os_family'] in ['RedHat', 'CentOS'] %}
 make-install-node:
   cmd.run:
     - cwd: /usr/src/node-v{{ version }}