diff options
| author |   Jing Lu <lvjing5@huawei.com> | 2017-03-13 03:53:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-13 03:53:31 +0000 |
| commit | 106eae2d19ca59e27262a7d8c3cd4501507697ff (patch) | |
| tree | 0a5c0afe82599605d3e12af9cf061b59d81eab27 | |
| parent | d5b9e8f73ab6c5020729f0e38c4337d56f9719ee (diff) | |
| parent | b32ba069a8233da64db4554dc0ee0edb985b8d43 (diff) | |
Merge "Bugfix: heat: don't json encode template"
| -rw-r--r-- | yardstick/orchestrator/heat.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/yardstick/orchestrator/heat.py b/yardstick/orchestrator/heat.py index 500776e0e..49126f661 100644 --- a/yardstick/orchestrator/heat.py +++ b/yardstick/orchestrator/heat.py @@ -21,7 +21,6 @@ import time import heatclient import pkg_resources -from oslo_serialization import jsonutils from oslo_utils import encodeutils import yardstick.common.openstack_utils as op_utils @@ -453,11 +452,9 @@ class HeatTemplate(HeatObject): stack = HeatStack(self.name) heat = self._get_heat_client() - json_template = jsonutils.dump_as_bytes( - self._template) start_time = time.time() stack.uuid = self.uuid = heat.stacks.create( - stack_name=self.name, template=json_template, + stack_name=self.name, template=self._template, parameters=self.heat_parameters)['stack']['id'] status = self.status() |