From: Sage Weil <sage@redhat.com>
Date: Fri, 31 Jul 2015 15:39:31 +0000 (-0400)
Subject: provision: specify ubuntu in __init__
X-Git-Tag: 1.1.0~860^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F519%2Fhead;p=teuthology.git

provision: specify ubuntu in __init__

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/teuthology/provision.py b/teuthology/provision.py
index 994b21d8..516ae03a 100644
--- a/teuthology/provision.py
+++ b/teuthology/provision.py
@@ -42,13 +42,14 @@ class Downburst(object):
     A class that provides methods for creating and destroying virtual machine
     instances using downburst: https://github.com/ceph/downburst
     """
-    def __init__(self, name, os_type, os_version, status=None):
+    def __init__(self, name, os_type, os_version, status=None, user='ubuntu'):
         self.name = name
         self.os_type = os_type
         self.os_version = os_version
         self.status = status or get_status(self.name)
         self.config_path = None
         self.user_path = None
+        self.user = user
         self.host = decanonicalize_hostname(self.status['vm_host']['name'])
         self.executable = downburst_executable()
 
@@ -169,7 +170,7 @@ class Downburst(object):
         self.config_path = config_fd.name
 
         user_info = {
-            'user': 'ubuntu',
+            'user': self.user,
         }
         user_fd = tempfile.NamedTemporaryFile(delete=False)
         yaml.safe_dump(user_info, user_fd)