From 58939444e64299eb8d3020d1ea8b8ff314395482 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 7 Jun 2018 14:01:07 +0300 Subject: [PATCH] Don't install virtualenv as user. --- infrared/common/roles/shade/tasks/main.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/infrared/common/roles/shade/tasks/main.yml b/infrared/common/roles/shade/tasks/main.yml index 8d72106445..76623ae036 100644 --- a/infrared/common/roles/shade/tasks/main.yml +++ b/infrared/common/roles/shade/tasks/main.yml @@ -18,7 +18,6 @@ pip: name: virtualenv state: forcereinstall - extra_args: --user # required to avoid any conflicts in venv with # different packages versions (especially shade) @@ -31,12 +30,11 @@ # do not use shimming for these two special packages - name: shade virtualenv core deps pip: - name: "{{ item }}" + name: + - setuptools>=39.0.0 + - pip>=10.0.1 virtualenv: "{{ shade_path_venv }}" virtualenv_command: "{{ ansible_env.HOME }}/.local/bin/virtualenv" - with_items: - - setuptools>=39.0.0 - - pip>=10.0.1 - name: shade virtualenv deps pip: @@ -48,4 +46,3 @@ # see https://projects.engineering.redhat.com/browse/RHOSINFRA-1562 # TODO: unpin shade to avoid other conflicts virtualenv: "{{ shade_path_venv }}" - virtualenv_command: "{{ ansible_env.HOME }}/.local/bin/virtualenv"