]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
ceph_ansible: Remove --system-site-packages 1662/head
authorBrad Hubbard <bhubbard@redhat.com>
Tue, 27 Jul 2021 04:04:04 +0000 (14:04 +1000)
committerBrad Hubbard <bhubbard@redhat.com>
Fri, 30 Jul 2021 00:17:38 +0000 (10:17 +1000)
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>
teuthology/task/ceph_ansible.py

index 9c2f2844843355aa60d411226dd42aef7e27e52f..a91403f79f58ba39297486c61ec4e591dcdea25b 100644 (file)
@@ -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)