From: David Galloway <dgallowa@redhat.com>
Date: Fri, 26 Aug 2016 20:44:42 +0000 (-0400)
Subject: Install git on downbursted VMs during cloud-init
X-Git-Tag: 1.1.0~539^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bb30f5c07ebe3c52adb4dc4c42399ba6c8dc97b7;p=teuthology.git

Install git on downbursted VMs during cloud-init

Fixes: http://tracker.ceph.com/issues/17154

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/teuthology/provision/downburst.py b/teuthology/provision/downburst.py
index b42ae4cfa..7794d94af 100644
--- a/teuthology/provision/downburst.py
+++ b/teuthology/provision/downburst.py
@@ -180,6 +180,13 @@ class Downburst(object):
                 ['passwd', '-d', self.user],
             ]
         }
+        # Install git on downbursted VMs to clone upstream linux-firmware.
+        # Issue #17154
+        if 'packages' not in user_info:
+            user_info['packages'] = list()
+        user_info['packages'].extend([
+            'git',
+        ])
         # On CentOS/RHEL/Fedora, write the correct mac address
         if os_type in ['centos', 'rhel', 'fedora']:
             user_info['runcmd'].extend([
@@ -189,11 +196,7 @@ class Downburst(object):
         # On Ubuntu, starting with 16.04, we need to install 'python' to get
         # python2.7, which ansible needs
         elif os_type == 'ubuntu':
-            if 'packages' not in user_info:
-                user_info['packages'] = list()
-            user_info['packages'].extend([
-                'python',
-            ])
+            user_info['packages'].append('python')
         user_fd = tempfile.NamedTemporaryFile(delete=False)
         yaml.safe_dump(user_info, user_fd)
         self.user_path = user_fd.name