HeatContext model update to match heat code update

In Heat Liberty release OS::Nova::Server will always use the user
pre-configured in the image (e.g. "fedora" for stock Fedora cloud
images, "ubuntu" for stock Ubuntu cloud images, "cloud-user" for
stock CentOS cloud images etc)

Change all ec2-user -> ubuntu

Add admin-user in Heat model for backwards compatibility.

Refer below links for detalis:
https://etherpad.opnfv.org/p/yardstick_release_b_troubleshooting
https://github.com/openstack/heat/commit/e423bec7f10b0f5d07f05d195b3b7860f6bceb00
http://blog.scottlowe.org/2015/04/23/ubuntu-openstack-heat-cloud-init/

JIRA: -

Change-Id: I6b8b2b21daf113a3a86aee1126b0c3e74737ef4f
Signed-off-by: QiLiang <liangqi1@huawei.com>

4 files changed, 11 insertions, 6 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",
diff --git a/yardstick/orchestrator/heat.py b/yardstick/orchestrator/heat.py
index 470f938ed..8d535c252 100644
--- a/yardstick/orchestrator/heat.py
+++ b/yardstick/orchestrator/heat.py
@@ -353,8 +353,8 @@ class HeatTemplate(HeatObject):
         }
 
     def add_server(self, name, image, flavor, ports=None, networks=None,
-                   scheduler_hints=None, key_name=None, user_data=None,
-                   metadata=None, additional_properties=None):
+                   scheduler_hints=None, user=None, key_name=None,
+                   user_data=None, metadata=None, additional_properties=None):
         '''add to the template a Nova Server'''
         log.debug("adding Nova::Server '%s', image '%s', flavor '%s', "
                   "ports %s", name, image, flavor, ports)
@@ -370,6 +370,9 @@ class HeatTemplate(HeatObject):
             'networks': []  # list of dictionaries
         }
 
+        if user:
+            server_properties['admin_user'] = user
+
         if key_name:
             self.resources[name]['depends_on'] = [key_name]
             server_properties['key_name'] = {'get_resource': key_name}