diff options
| author |   liang gao <jean.gaoliang@huawei.com> | 2016-08-01 07:24:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-01 07:24:31 +0000 |
| commit | fe46800c17c055ee337dddb2e2de00d6db128cda (patch) | |
| tree | 0feb708dbf4213795cdf0846125a5f3fcc0f2249 /yardstick/benchmark | |
| parent | f29d785861ae0021ffe35b054ab77379253abb8b (diff) | |
| parent | 2f5b58d700201a259c686d05b7f0c5a8814d6e1f (diff) | |
Merge "Bugfix: Only add keyword "external_network" to the first network"
Diffstat (limited to 'yardstick/benchmark')
| -rw-r--r-- | yardstick/benchmark/contexts/model.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/yardstick/benchmark/contexts/model.py b/yardstick/benchmark/contexts/model.py index 2cf31f6ea..d31f4afc0 100644 --- a/yardstick/benchmark/contexts/model.py +++ b/yardstick/benchmark/contexts/model.py @@ -201,12 +201,12 @@ class Server(Object): port_name, network.router.stack_if_name, self.secgroup_name) - self.floating_ip_assoc["stack_name"] = \ - server_name + "-fip-assoc" - template.add_floating_ip_association( - self.floating_ip_assoc["stack_name"], - self.floating_ip["stack_name"], - port_name) + self.floating_ip_assoc["stack_name"] = \ + server_name + "-fip-assoc" + template.add_floating_ip_association( + self.floating_ip_assoc["stack_name"], + self.floating_ip["stack_name"], + port_name) template.add_server(server_name, self.image, self.flavor, ports=port_name_list, |