diff options
| author |   Jing Lu <lvjing5@huawei.com> | 2018-02-24 02:31:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-02-24 02:31:41 +0000 |
| commit | 639981d1a2c30a3501749dfe4a7a50609e05cb0b (patch) | |
| tree | cb1deb77987a78b8d0f80160182bc9e7d0392488 | |
| parent | e73f63767dcba5e3406a8a70a76e36d06fc38479 (diff) | |
| parent | d3c5f9eccf240162687ec0aa026e1b1065a982d6 (diff) | |
Merge "Bug Fix: Move heat_timeout variable higher"
| -rw-r--r-- | yardstick/benchmark/contexts/heat.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/yardstick/benchmark/contexts/heat.py b/yardstick/benchmark/contexts/heat.py index d873ee8a1..7b7f1be32 100644 --- a/yardstick/benchmark/contexts/heat.py +++ b/yardstick/benchmark/contexts/heat.py @@ -102,6 +102,8 @@ class HeatContext(Context): self._user = attrs.get("user") self.template_file = attrs.get("heat_template") + + self.heat_timeout = attrs.get("timeout", DEFAULT_HEAT_TIMEOUT) if self.template_file: self.heat_parameters = attrs.get("heat_parameters") return @@ -113,8 +115,6 @@ class HeatContext(Context): self._flavor = attrs.get("flavor") - self.heat_timeout = attrs.get("timeout", DEFAULT_HEAT_TIMEOUT) - self.placement_groups = [PlacementGroup(name, self, pg_attrs["policy"]) for name, pg_attrs in attrs.get( "placement_groups", {}).items()] |