diff options
| author |   Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com> | 2016-02-17 16:17:04 +0100 |
|---|---|---|
| committer | Jörgen Karlsson <jorgen.w.karlsson@ericsson.com> | 2016-02-18 13:33:13 +0000 |
| commit | f11eb13638a7c606982afee44d94006514b4d703 (patch) | |
| tree | a95a66913f5f48fd954220b3d6ee70d7ffd22b75 /yardstick/benchmark | |
| parent | c3666affeae842e3c2d8f9191928f3ae4437bc59 (diff) | |
Add heat template workaround for odl-l3
Change-Id: I476fdd4d0e0e97cb1457ae15f92442c42aa77b4e
Signed-off-by: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>
(cherry picked from commit c3949144ecd32e7152ba89a45795d7ca401d5d50)
Diffstat (limited to 'yardstick/benchmark')
| -rw-r--r-- | yardstick/benchmark/contexts/model.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/yardstick/benchmark/contexts/model.py b/yardstick/benchmark/contexts/model.py index bb61c613d..80abb9df3 100644 --- a/yardstick/benchmark/contexts/model.py +++ b/yardstick/benchmark/contexts/model.py @@ -145,8 +145,10 @@ class Server(Object): self.ports = {} self.floating_ip = None + self.floating_ip_assoc = None if "floating_ip" in attrs: self.floating_ip = {} + self.floating_ip_assoc = {} if self.floating_ip is not None: ext_net = Network.find_external_network() @@ -199,6 +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"], + server_name) template.add_server(server_name, self.image, self.flavor, ports=port_name_list, |