summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-07-24 22:55:41 +0000
committerGerrit Code Review <review@openstack.org>2019-07-24 22:55:41 +0000
commitc4c7f1a707c3d9920313e02707a6fe0c3080ae1b (patch)
tree073b35bb6aaf2f62f7d8af9a95fa9185827bcc3b
parentc04827e892ba37690c891e98c874c34600f0011c (diff)
parente7ad8dd0f94700bc6b03a055ebf0900a21c30ff7 (diff)
downloadheat-c4c7f1a707c3d9920313e02707a6fe0c3080ae1b.tar.gz
Merge "Don't resolve properties for OS::Heat::None resource" into stable/rocky
-rw-r--r--heat/engine/resources/openstack/heat/none_resource.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/heat/engine/resources/openstack/heat/none_resource.py b/heat/engine/resources/openstack/heat/none_resource.py
index 1c97dea77..8932344eb 100644
--- a/heat/engine/resources/openstack/heat/none_resource.py
+++ b/heat/engine/resources/openstack/heat/none_resource.py
@@ -38,6 +38,10 @@ class NoneResource(resource.Resource):
prev_resource, check_init_complete=True):
return False
+ def frozen_definition(self):
+ return self.t.freeze(
+ properties=properties.Properties(schema={}, data={}))
+
def reparse(self, client_resolve=True):
self.properties = properties.Properties(schema={}, data={})
self.translate_properties(self.properties, client_resolve)