From c7af9ab145e360fb0af6135157a329fbd31bf708 Mon Sep 17 00:00:00 2001
From: Brendan Melville <bmelville@google.com>
Date: Thu, 12 Nov 2015 11:30:38 -0800
Subject: [PATCH] Fixing jinja template for redis to allow for no properties.

Previously it assumed properties would exist.
---
 types/redis/v1/redis.jinja | 2 +-
 types/redis/v1/redis.yaml  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/types/redis/v1/redis.jinja b/types/redis/v1/redis.jinja
index b7d8451f3..0a19c863f 100644
--- a/types/redis/v1/redis.jinja
+++ b/types/redis/v1/redis.jinja
@@ -1,5 +1,5 @@
 {% 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
diff --git a/types/redis/v1/redis.yaml b/types/redis/v1/redis.yaml
index 12901829d..0b1b87b69 100644
--- 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