From: Brad Hubbard <bhubbard@redhat.com>
Date: Tue, 27 Jul 2021 04:04:04 +0000 (+1000)
Subject: ceph_ansible: Remove --system-site-packages
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=15b7033e18cefa0f185f68c4a6250a0e8a628feb;p=teuthology.git

ceph_ansible: Remove --system-site-packages

Upgrading ansible is problematic as it conflicts with the installed
package on Ubuntu 20.04 so don't try to use system packages.

Add LANG environment variable to 'pip install ansible' command to work
around pip failing due to file names in ansible package with exotic
characters.

Fixes: https://tracker.ceph.com/issues/51856

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
---

diff --git a/teuthology/task/ceph_ansible.py b/teuthology/task/ceph_ansible.py
index 9c2f284484..a91403f79f 100644
--- a/teuthology/task/ceph_ansible.py
+++ b/teuthology/task/ceph_ansible.py
@@ -404,7 +404,6 @@ class CephAnsible(Task):
             run.Raw('cd ~/ceph-ansible'),
             run.Raw(';'),
             'virtualenv',
-            run.Raw('--system-site-packages'),
             run.Raw('--python=python3'),
             'venv',
             run.Raw(';'),
@@ -426,6 +425,10 @@ class CephAnsible(Task):
             run.Raw('notario>=0.0.13'), # FIXME: use requirements.txt
             run.Raw('netaddr'),
             run.Raw('six'),
+            run.Raw(';'),
+            'LANG=en_US.utf8',
+            'pip',
+            'install',
             run.Raw(ansible_ver),
             run.Raw(';'),
             run.Raw(str_args)