Give alarm a physical_resource_name which need no id.

This restores previous behaviour, including workarounds for
circular dependencies.

Fixes bug: #1192814

Change-Id: I33e8e4d7806fb397553944dbd6ebb85b575b9cb5

diff --git a/heat/engine/resources/cloud_watch.py b/heat/engine/resources/cloud_watch.py
index 7f110f6af6cde27d7ed7bfa379416bfbba557704..46cbdd3edda8feb17e4ba5b3106fe50a6155e43b 100644 (file)
--- a/heat/engine/resources/cloud_watch.py
+++ b/heat/engine/resources/cloud_watch.py
@@ -115,6 +115,9 @@ class CloudWatchAlarm(resource.Resource):
     def FnGetRefId(self):
         return unicode(self.physical_resource_name())
 
+    def physical_resource_name(self):
+        return '%s-%s' % (self.stack.name, self.name)
+
 
 def resource_mapping():
     return {