diff options
Diffstat (limited to 'yardstick/benchmark')
| -rw-r--r-- | yardstick/benchmark/contexts/model.py | 2 | ||||
| -rw-r--r-- | yardstick/benchmark/scenarios/compute/cpuload.py | 2 | ||||
| -rw-r--r-- | yardstick/benchmark/scenarios/storage/fio.py | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/yardstick/benchmark/contexts/model.py b/yardstick/benchmark/contexts/model.py index 91020b92f..bb61c613d 100644 --- a/yardstick/benchmark/contexts/model.py +++ b/yardstick/benchmark/contexts/model.py @@ -118,6 +118,7 @@ class Server(Object): self.stack_name = self.name + "." + context.name self.keypair_name = context.keypair_name self.secgroup_name = context.secgroup_name + self.user = context.user self.context = context self.public_ip = None self.private_ip = None @@ -201,6 +202,7 @@ class Server(Object): template.add_server(server_name, self.image, self.flavor, ports=port_name_list, + user=self.user, key_name=self.keypair_name, scheduler_hints=scheduler_hints) diff --git a/yardstick/benchmark/scenarios/compute/cpuload.py b/yardstick/benchmark/scenarios/compute/cpuload.py index 2b458ff64..d11bec5c3 100644 --- a/yardstick/benchmark/scenarios/compute/cpuload.py +++ b/yardstick/benchmark/scenarios/compute/cpuload.py @@ -219,7 +219,7 @@ class CPULoad(base.Scenario): # ctx = { # 'host': { # 'ip': '172.16.0.175', -# 'user': 'ec2-user', +# 'user': 'ubuntu', # 'key_filename': key_filename # } # } diff --git a/yardstick/benchmark/scenarios/storage/fio.py b/yardstick/benchmark/scenarios/storage/fio.py index 8969472e9..a8d27faba 100644 --- a/yardstick/benchmark/scenarios/storage/fio.py +++ b/yardstick/benchmark/scenarios/storage/fio.py @@ -23,7 +23,7 @@ class Fio(base.Scenario): filename - file name for fio workload type: string unit: na - default: /home/ec2-user/data.raw + default: /home/ubuntu/data.raw bs - block size used for the io units type: int unit: bytes @@ -82,7 +82,7 @@ class Fio(base.Scenario): self.setup() options = self.scenario_cfg["options"] - filename = options.get("filename", "/home/ec2-user/data.raw") + filename = options.get("filename", "/home/ubuntu/data.raw") bs = options.get("bs", "4k") iodepth = options.get("iodepth", "1") rw = options.get("rw", "write") @@ -162,7 +162,7 @@ def _test(): logger.setLevel(logging.DEBUG) options = { - "filename": "/home/ec2-user/data.raw", + "filename": "/home/ubuntu/data.raw", "bs": "4k", "iodepth": "1", "rw": "rw", |