Incorrect name

StorPerf agent now uses storperf in ssh
HOT uses default name StorPerf Ubuntu 14.04

Change-Id: Ie87443955c73d1e81fb3a75b90e4a65a9ac6560b
JIRA: STORPERF-39
Signed-off-by: Mark Beierl <mark.beierl@emc.com>

diff --git a/storperf/fio/fio_invoker.py b/storperf/fio/fio_invoker.py
index 017f74a..5e30a76 100644 (file)
--- a/storperf/fio/fio_invoker.py
+++ b/storperf/fio/fio_invoker.py
@@ -8,6 +8,7 @@
 ##############################################################################
 
 from threading import Thread
+import cmd
 import json
 import logging
 import subprocess
@@ -78,7 +79,7 @@ class FIOInvoker(object):
             cmd = "ssh"
             additional_args = ['-o', 'StrictHostKeyChecking=no',
                                '-i', 'storperf/resources/ssh/storperf_rsa',
-                               'ubuntu@' + self.remote_host,
+                               'storperf@' + self.remote_host,
                                "sudo", "./fio"]
             args = additional_args + args
 

diff --git a/storperf/resources/hot/storperf-agent.yaml b/storperf/resources/hot/storperf-agent.yaml
index 94238e5..ffda9c4 100644 (file)
--- a/storperf/resources/hot/storperf-agent.yaml
+++ b/storperf/resources/hot/storperf-agent.yaml
@@ -15,7 +15,7 @@ parameters:
     default: m1.small
   image:
     type: string
-    default: 'StorPerf Agent'
+    default: 'StorPerf Ubuntu 14.04'
   key_name:
     type: string
     default: StorPerf

diff --git a/storperf/storperf_master.py b/storperf/storperf_master.py
index c5d436e..a467aef 100644 (file)
--- a/storperf/storperf_master.py
+++ b/storperf/storperf_master.py
@@ -266,7 +266,7 @@ class StorPerfMaster(object):
         args = ['scp', '-o', 'StrictHostKeyChecking=no',
                 '-i', 'storperf/resources/ssh/storperf_rsa',
                 '/lib/x86_64-linux-gnu/libaio.so.1',
-                'ubuntu@' + slave + ":"]
+                'storperf@' + slave + ":"]
 
         logger.debug(args)
         proc = subprocess.Popen(args,
@@ -283,7 +283,7 @@ class StorPerfMaster(object):
         args = ['scp', '-o', 'StrictHostKeyChecking=no',
                 '-i', 'storperf/resources/ssh/storperf_rsa',
                 '/usr/local/bin/fio',
-                'ubuntu@' + slave + ":"]
+                'storperf@' + slave + ":"]
 
         logger.debug(args)
         proc = subprocess.Popen(args,
@@ -299,7 +299,7 @@ class StorPerfMaster(object):
 
         args = ['ssh', '-o', 'StrictHostKeyChecking=no',
                 '-i', 'storperf/resources/ssh/storperf_rsa',
-                'ubuntu@' + slave,
+                'storperf@' + slave,
                 'sudo cp -v libaio.so.1 /lib/x86_64-linux-gnu/libaio.so.1'
                 ]