openstack/heat
Code Issues Proposed changes

Fix OS::Heat::Delay resource type

Browse Source 
Don't override ResourceStatus.ACTIONS, as it's used internally by the
Resource class.

Change-Id: Icf306e981c19e3d5410905befa7907dcdba33337
Story: 2008013
Task: 40663
This commit is contained in:
Zane Bitter 2020-08-13 11:35:21 -04:00
parent 9e6c3212b9
commit c362c57854
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
heat/engine/resources/openstack/heat/delay.py
View File

@ -51,7 +51,7 @@ class Delay(resource.Resource):
) )
PROPERTIES = ( PROPERTIES = (
MIN_WAIT_SECS, MAX_JITTER, JITTER_MULTIPLIER_SECS, ACTIONS, MIN_WAIT_SECS, MAX_JITTER, JITTER_MULTIPLIER_SECS, DELAY_ACTIONS,
) = ( ) = (
'min_wait', 'max_jitter', 'jitter_multiplier', 'actions', 'min_wait', 'max_jitter', 'jitter_multiplier', 'actions',
) )
@ -84,7 +84,7 @@ class Delay(resource.Resource):
constraints.Range(min=0), constraints.Range(min=0),
] ]
), ),
ACTIONS: properties.Schema( DELAY_ACTIONS: properties.Schema(
properties.Schema.LIST, properties.Schema.LIST,
_('Actions during which the delay will occur.'), _('Actions during which the delay will occur.'),
update_allowed=True, update_allowed=True,
@ -119,7 +119,7 @@ class Delay(resource.Resource):
def _wait_secs(self, action): def _wait_secs(self, action):
"""Return a (randomised) wait time for the specified action.""" """Return a (randomised) wait time for the specified action."""
if action not in self.properties[self.ACTIONS]: if action not in self.properties[self.DELAY_ACTIONS]:
return 0 return 0
min_wait_secs, max_jitter_secs = self._delay_parameters() min_wait_secs, max_jitter_secs = self._delay_parameters()

4
releasenotes/notes/delay-resource-7d44c512081026c8.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- |
The ``OS::Heat::Delay`` resource type is now usable.