diff options
author | Zane Bitter <zbitter@redhat.com> | 2020-08-13 11:35:21 -0400 |
---|---|---|
committer | Zane Bitter <zbitter@redhat.com> | 2020-08-13 11:39:17 -0400 |
commit | c362c57854f7d841a72dd9de2f6ec3a9b9187f82 (patch) | |
tree | 0ebcd985d3c41f57f638c2480681451616ea7159 /heat | |
parent | 9e6c3212b9434222702e496c954cdd144b2d3b12 (diff) | |
download | heat-c362c57854f7d841a72dd9de2f6ec3a9b9187f82.tar.gz |
Fix OS::Heat::Delay resource type
Don't override ResourceStatus.ACTIONS, as it's used internally by the
Resource class.
Change-Id: Icf306e981c19e3d5410905befa7907dcdba33337
Story: 2008013
Task: 40663
Diffstat (limited to 'heat')
-rw-r--r-- | heat/engine/resources/openstack/heat/delay.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/heat/engine/resources/openstack/heat/delay.py b/heat/engine/resources/openstack/heat/delay.py index 643a2b2c0..5a6623273 100644 --- a/heat/engine/resources/openstack/heat/delay.py +++ b/heat/engine/resources/openstack/heat/delay.py @@ -51,7 +51,7 @@ class Delay(resource.Resource): ) 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', ) @@ -84,7 +84,7 @@ class Delay(resource.Resource): constraints.Range(min=0), ] ), - ACTIONS: properties.Schema( + DELAY_ACTIONS: properties.Schema( properties.Schema.LIST, _('Actions during which the delay will occur.'), update_allowed=True, @@ -119,7 +119,7 @@ class Delay(resource.Resource): def _wait_secs(self, 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 min_wait_secs, max_jitter_secs = self._delay_parameters() |