From 85d6d65b97bf6a044bde2807370b730c8c3f1431 Mon Sep 17 00:00:00 2001
From: Zane Bitter <zbitter@redhat.com>
Date: Thu, 13 Aug 2020 11:35:21 -0400
Subject: [PATCH] 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)
---
 heat/engine/resources/openstack/heat/delay.py           | 6 +++---
 releasenotes/notes/delay-resource-7d44c512081026c8.yaml | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/delay-resource-7d44c512081026c8.yaml

diff --git a/heat/engine/resources/openstack/heat/delay.py b/heat/engine/resources/openstack/heat/delay.py
index 643a2b2c0c..5a6623273e 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()
diff --git a/releasenotes/notes/delay-resource-7d44c512081026c8.yaml b/releasenotes/notes/delay-resource-7d44c512081026c8.yaml
new file mode 100644
index 0000000000..27460753c2
--- /dev/null
+++ b/releasenotes/notes/delay-resource-7d44c512081026c8.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    The ``OS::Heat::Delay`` resource type is now usable.