openstack
/
heat
Code Issues Proposed changes

Merge "engine : remove unused update states/status"

This commit is contained in:
Jenkins 2013-05-21 05:06:54 +00:00 committed by Gerrit Code Review
parent fe7d5d3435 ab60d9b97f
commit 8492d2112c
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
heat/engine/parser.py
View File

@ -375,16 +375,11 @@ class Stack(object):
# based on the parsed template snippet for the resource.
# If this test fails, we call the underlying resource.update
#
# FIXME : Implement proper update logic for the resources
# AWS define three update strategies, applied depending
# on the resource and what is being updated within a
# resource :
# - Update with no interruption
# - Update with some interruption
# - Update requires replacement
#
# Currently all resource have a default handle_update method
# Currently many resources have a default handle_update method
# which returns "requires replacement" (res.UPDATE_REPLACE)
# optionally they may implement non-interruptive logic and
# return UPDATE_COMPLETE. If resources do not implement the
# handle_update method at all, update will fail.
for res in newstack:
# Compare resolved pre/post update resource snippets,
# note the new resource snippet is resolved in the context

6
heat/engine/resource.py
View File

@ -93,11 +93,8 @@ class Resource(object):
UPDATE_FAILED = 'UPDATE_FAILED'
UPDATE_COMPLETE = 'UPDATE_COMPLETE'
# Status values, returned from subclasses to indicate update method
# Status value, returned from subclasses to indicate replacement required
UPDATE_REPLACE = 'UPDATE_REPLACE'
UPDATE_INTERRUPTION = 'UPDATE_INTERRUPTION'
UPDATE_NO_INTERRUPTION = 'UPDATE_NO_INTERRUPTION'
UPDATE_NOT_IMPLEMENTED = 'UPDATE_NOT_IMPLEMENTED'
# If True, this resource must be created before it can be referenced.
strict_dependency = True
@ -373,7 +370,6 @@ class Resource(object):
logger.info('updating %s' % str(self))
result = self.UPDATE_NOT_IMPLEMENTED
try:
self.state_set(self.UPDATE_IN_PROGRESS)
properties = Properties(self.properties_schema,