Merge pull request #41 from smitelli/master

Add a falsy default to each instance of pillar.get

Author: noelmcloughlin

node/config.sls

@@ -1,5 +1,5 @@
 {% from "node/map.jinja" import npmrc with context %}
-{% set config = salt['pillar.get']('npm:config') %}
+{% set config = salt['pillar.get']('npm:config', '') %}
 {% if config %}
 {{ npmrc }}:
   file.managed:

node/init.sls

@@ -1,8 +1,8 @@
 {% set pillar_get = salt['pillar.get'] -%}
 include:
-{% if pillar_get('node:install_from_source') %}
+{% if pillar_get('node:install_from_source', '') %}
   - .source
-{% elif pillar_get('node:install_from_binary') %}
+{% elif pillar_get('node:install_from_binary', '') %}
   - .binary
 {% else %}
   - .pkg

node/map.jinja

@@ -1,6 +1,6 @@
 {% set pillar_get = salt['pillar.get'] -%}
 
-{% if pillar_get('node:install_from_source') %}
+{% if pillar_get('node:install_from_source', '') %}
   {% set default_npm_prefix = '/usr/local' %}
 {% else %}
   {% set default_npm_prefix = '/usr' %}
@@ -22,20 +22,20 @@
         'npm_pkg': 'npm',
     },
     'Debian': {
-        'node_pkg': 'nodejs' if grains['osrelease']|float < 8 or pillar_get('node:install_from_ppa') else 'nodejs-legacy',
-        'npm_pkg': 'nodejs' if pillar_get('node:install_from_ppa') else 'npm',
+        'node_pkg': 'nodejs' if grains['osrelease']|float < 8 or pillar_get('node:install_from_ppa', '') else 'nodejs-legacy',
+        'npm_pkg': 'nodejs' if pillar_get('node:install_from_ppa', '') else 'npm',
     },
     'Ubuntu': {
         'node_pkg': 'nodejs',
-        'npm_pkg': 'nodejs' if pillar_get('node:install_from_ppa') else 'npm',
+        'npm_pkg': 'nodejs' if pillar_get('node:install_from_ppa', '') else 'npm',
     },
     'Raspbian': {
         'node_pkg': 'nodejs',
-        'npm_pkg': 'nodejs' if pillar_get('node:install_from_ppa') else 'npm',
+        'npm_pkg': 'nodejs' if pillar_get('node:install_from_ppa', '') else 'npm',
     },
-}, grain='os', merge=pillar_get('node:lookup')) %}
+}, grain='os', merge=pillar_get('node:lookup', '')) %}
 
-{% 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')) %}
+{% 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']) %}
@@ -48,4 +48,4 @@
   'RedHat': {
     'pkgs': ['git', 'curl', 'gcc','openssl-devel','pkgconfig', 'gcc-c++', 'make', 'automake']
   },
-}, grain='os_family', merge=pillar_get('from_src_requirements:lookup'), default='Debian') %}
+}, grain='os_family', merge=pillar_get('from_src_requirements:lookup', ''), default='Debian') %}

node/pkg.sls

@@ -1,6 +1,6 @@
 {%- from "node/map.jinja" import node, npm_bin with context %}
 
-{%- if grains['os_family'] 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
@@ -21,6 +21,6 @@ nodejs:
   pkg.installed:
     - name: {{ node.node_pkg }}
     - reload_modules: true
-{%- if salt['pillar.get']('node:version') %}
-    - version: {{ salt['pillar.get']('node:version') }}
+{%- if salt['pillar.get']('node:version', '') %}
+    - version: {{ salt['pillar.get']('node:version', '') }}
 {%- endif %}