From 30e247e585969b29b5a504c0b6bbd23d07ea80c8 Mon Sep 17 00:00:00 2001 From: Ross Brattain Date: Wed, 15 Mar 2017 19:46:19 -0700 Subject: pass user_data to heat template We had code to support adding user_data but the Server model was not connected. The string formatting of the user_data is left as an exercise for the reader. Change-Id: I298657b93de67e19436bca616b119df636dacce2 Signed-off-by: Ross Brattain --- yardstick/benchmark/contexts/model.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'yardstick/benchmark/contexts/model.py') diff --git a/yardstick/benchmark/contexts/model.py b/yardstick/benchmark/contexts/model.py index 8cf3b621c..039686554 100644 --- a/yardstick/benchmark/contexts/model.py +++ b/yardstick/benchmark/contexts/model.py @@ -148,6 +148,7 @@ class Server(Object): # pragma: no cover self.context = context self.public_ip = None self.private_ip = None + self.user_data = '' if attrs is None: attrs = {} @@ -200,6 +201,8 @@ class Server(Object): # pragma: no cover if "flavor" in attrs: self._flavor = attrs["flavor"] + self.user_data = attrs.get('user_data', '') + Server.list.append(self) @property @@ -249,6 +252,7 @@ class Server(Object): # pragma: no cover ports=port_name_list, user=self.user, key_name=self.keypair_name, + user_data=self.user_data, scheduler_hints=scheduler_hints) def add_to_template(self, template, networks, scheduler_hints=None): -- cgit 1.2.3-korg