From: Zack Cerza <zack@redhat.com>
Date: Wed, 15 Jun 2016 17:44:47 +0000 (-0600)
Subject: Install python 2.7 on ubuntu downburst VMs
X-Git-Tag: 1.1.0~601^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d9212ba37804dfafc4928c236c2ad6e6128c120f;p=teuthology.git

Install python 2.7 on ubuntu downburst VMs

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

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/teuthology/provision.py b/teuthology/provision.py
index 0969d1e9aa..fcfa51bfbf 100644
--- a/teuthology/provision.py
+++ b/teuthology/provision.py
@@ -194,6 +194,14 @@ class Downburst(object):
                 ['sed', '-ie', 's/HWADDR=".*"/HWADDR="%s"/' % mac_address,
                  '/etc/sysconfig/network-scripts/ifcfg-eth0'],
             ])
+        # On Ubuntu, starting with 16.04, we need to install 'python' to get
+        # python2.7, which ansible needs
+        elif os_type == 'ubuntu':
+            if not 'packages' in user_info:
+                user_info['packages'] = list()
+            user_info['packages'].extend([
+                'python',
+            ])
         user_fd = tempfile.NamedTemporaryFile(delete=False)
         yaml.safe_dump(user_info, user_fd)
         self.user_path = user_fd.name