Merge pull request #51 from bmelville/master

Fixing jinja template for redis to allow for no properties.

Merge pull request #51 from bmelville/master
Fixing jinja template for redis to allow for no properties.
488dc041 · vaikas-google · 9d1a5d8c · c7af9ab1 · 488dc041 · 488dc041
Commit 488dc041 authored Nov 12, 2015 by vaikas-google
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

redis.jinja types/redis/v1/redis.jinja +1 -1

redis.yaml types/redis/v1/redis.yaml +0 -1

No files found.
--- a/types/redis/v1/redis.jinja
+++ b/types/redis/v1/redis.jinja
 {% set REDIS_PORT = 6379 %}
-{% set WORKERS = properties['workers'] or 2 %}
+{% set WORKERS = properties['workers'] if properties and properties['workers'] else 2 %}

 resources:
 - name: redis-master

--- a/types/redis/v1/redis.yaml
+++ b/types/redis/v1/redis.yaml
@@ -4,4 +4,3 @@ imports:
 resources:
 - name: redis
  type: redis.jinja
-  properties: null