diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-05-16 07:47:14 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-05-16 07:47:14 +0000 |
commit | 99074df4b25cbbc41a2659e05819363c45264f75 (patch) | |
tree | bfeae975125df9497eec0e6b154e199600266d2f /contrib | |
parent | becf3c92a5026d61c118ff7624b9271653bd9ef3 (diff) | |
parent | f1751ae84c60652e8e7ecdca49f8ca8f91becb11 (diff) | |
download | heat-99074df4b25cbbc41a2659e05819363c45264f75.tar.gz |
Merge "Don't treat ResourceDefinition as cfn template in resources"
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/rackspace/rackspace/resources/auto_scale.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/rackspace/rackspace/resources/auto_scale.py b/contrib/rackspace/rackspace/resources/auto_scale.py index a25b2bca7..57f73a40d 100644 --- a/contrib/rackspace/rackspace/resources/auto_scale.py +++ b/contrib/rackspace/rackspace/resources/auto_scale.py @@ -749,7 +749,8 @@ class WebHook(resource.Resource): def handle_update(self, json_snippet, tmpl_diff, prop_diff): asclient = self.auto_scale() - args = self._get_args(json_snippet['Properties']) + args = self._get_args(json_snippet.properties(self.properties_schema, + self.context)) args['webhook'] = self.resource_id asclient.replace_webhook(**args) |