From 3f73f82a0d4370b6a938fd5d5df6b7c91639d023 Mon Sep 17 00:00:00 2001
From: Angus Salkeld <asalkeld@mirantis.com>
Date: Thu, 25 Sep 2014 15:30:46 +1000
Subject: [PATCH] Don't pass empty action strings to ceilometer

Note: this only really happens when using the cloud watch
resource template.

Partial-bug: #1373247
Change-Id: I084d28dfbbd0f2d7a6a18a09600f86880fa394d5
---
 heat/engine/resources/ceilometer/alarm.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/heat/engine/resources/ceilometer/alarm.py b/heat/engine/resources/ceilometer/alarm.py
index a7481d0ad..67d4562d9 100644
--- a/heat/engine/resources/ceilometer/alarm.py
+++ b/heat/engine/resources/ceilometer/alarm.py
@@ -84,7 +84,8 @@ def actions_to_urls(stack, properties):
                     url = stack[act].FnGetAtt('AlarmUrl')
                     kwargs[k].append(url)
                 else:
-                    kwargs[k].append(act)
+                    if act:
+                        kwargs[k].append(act)
         else:
             kwargs[k] = v
     return kwargs