Delete redundant escalation_policy (rather use instance.restarter)

Change-Id: Ia5f6b6adfc5c8c60e1db5b2f4e0aa186d0437ad9
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

diff --git a/heat/engine/escalation_policy.py b/heat/engine/escalation_policy.py
deleted file mode 100644 (file)
index 65e34e0..0000000
--- a/heat/engine/escalation_policy.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import eventlet
-import logging
-import json
-import os
-
-from heat.common import exception
-from heat.db import api as db_api
-from heat.engine.resources import Resource
-
-logger = logging.getLogger('heat.engine.escalation_policy')
-
-
-class EscalationPolicy(Resource):
-    properties_schema = {
-            'Instance': {'Type': 'String'},
-            }
-
-    def __init__(self, name, json_snippet, stack):
-        super(EscalationPolicy, self).__init__(name, json_snippet, stack)
-        self.instance_id = ''
-
-    def validate(self):
-        '''
-        Validate the Properties
-        '''
-        return Resource.validate(self)
-
-    def create(self):
-        if self.state in [self.CREATE_IN_PROGRESS, self.CREATE_COMPLETE]:
-            return
-        self.state_set(self.CREATE_IN_PROGRESS)
-        Resource.create(self)
-        self.state_set(self.CREATE_COMPLETE)
-
-    def delete(self):
-        if self.state in [self.DELETE_IN_PROGRESS, self.DELETE_COMPLETE]:
-            return
-
-        self.state_set(self.DELETE_IN_PROGRESS)
-
-        Resource.delete(self)
-        self.state_set(self.DELETE_COMPLETE)
-
-    def FnGetRefId(self):
-        return unicode(self.name)
-
-    def strict_dependency(self):
-        return False

diff --git a/heat/engine/resource_types.py b/heat/engine/resource_types.py
index cc2fa3d9485361313101e06206f1f3d0de6a6763..e0ed030f63b8d05c478ed52a68a4b2342e1337c1 100644 (file)
--- a/heat/engine/resource_types.py
+++ b/heat/engine/resource_types.py
@@ -22,7 +22,6 @@ from heat.engine import resources
 
 from heat.engine import cloud_watch
 from heat.engine import eip
-from heat.engine import escalation_policy
 from heat.engine import instance
 from heat.engine import security_group
 from heat.engine import user
@@ -44,7 +43,6 @@ _resource_classes = {
     'AWS::IAM::User': user.User,
     'AWS::IAM::AccessKey': user.AccessKey,
     'HEAT::HA::Restarter': instance.Restarter,
-    'HEAT::Recovery::EscalationPolicy': escalation_policy.EscalationPolicy,
 }