Browse Source

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
(cherry picked from commit c362c57854f7d841a72dd9de2f6ec3a9b9187f82)
(cherry picked from commit 18f2ed6b0ce0e25cf28775e99a2ec046468b0262)
changes/79/757179/2
Zane Bitter 10 months ago
committed by David Hill
parent
commit
85d6d65b97
2 changed files with 7 additions and 3 deletions
  1. +3
    -3
      heat/engine/resources/openstack/heat/delay.py
  2. +4
    -0
      releasenotes/notes/delay-resource-7d44c512081026c8.yaml

+ 3
- 3
heat/engine/resources/openstack/heat/delay.py View File

@ -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()


+ 4
- 0
releasenotes/notes/delay-resource-7d44c512081026c8.yaml View File

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

Loading…
Cancel
Save