From: Steve Baker <sbaker@redhat.com>
Date: Fri, 21 Jun 2013 00:21:51 +0000 (+1200)
Subject: Give alarm a physical_resource_name which need no id.
X-Git-Tag: 2014.1~449^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3204dea9f7a6cb0e88955ace0a6a014db546e89c;p=openstack-build%2Fheat-build.git

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 7f110f6a..46cbdd3e 100644
--- 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 {