From f11eb13638a7c606982afee44d94006514b4d703 Mon Sep 17 00:00:00 2001 From: Jo¶rgen Karlsson Date: Wed, 17 Feb 2016 16:17:04 +0100 Subject: Add heat template workaround for odl-l3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I476fdd4d0e0e97cb1457ae15f92442c42aa77b4e Signed-off-by: Jo¶rgen Karlsson (cherry picked from commit c3949144ecd32e7152ba89a45795d7ca401d5d50) --- yardstick/benchmark/contexts/model.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'yardstick/benchmark/contexts') 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, -- cgit 1.2.3-korg