From 3588ffbb7b8dffb8de39751034456c1c29277c8b Mon Sep 17 00:00:00 2001 From: Quique Llorente Date: Tue, 23 Oct 2018 10:37:48 +0200 Subject: [PATCH] Don't install setuptools/pip/virtualenv from RPMs Openstack infra has them already installed and we are not supose to install it, for example at fedora the exclude them explitcitly from the dnf.conf Change-Id: I3b276e159ff7534777219975995fc20c967d0e42 Store: https://tree.taiga.io/project/tripleo-ci-board/task/248?kanban-status=1447275 --- roles/build-test-packages/tasks/main.yml | 12 +++++++++++- .../tasks/overcloud-prep-containers.yml | 10 ++++++++-- roles/validate-tempest/tasks/tempest-venv.yml | 13 ++++++++++++- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/roles/build-test-packages/tasks/main.yml b/roles/build-test-packages/tasks/main.yml index 15b7f87ef..90088a2e4 100644 --- a/roles/build-test-packages/tasks/main.yml +++ b/roles/build-test-packages/tasks/main.yml @@ -10,13 +10,23 @@ - libffi-devel - mock - openssl-devel - - python-virtualenv - rpm-build - sqlite - redhat-rpm-config - rpmdevtools - libselinux-python +- name: Check if virtualenv is in the system + shell: command -v virtualenv >/dev/null 2>&1 + register: virtualenv_exist + ignore_errors: yes + +- when: virtualenv_exist.rc == 1 + name: Install virtualenv + package: + name: python-virtualenv + state: present + - name: Create mock group become: yes group: name=mock state=present diff --git a/roles/overcloud-prep-containers/tasks/overcloud-prep-containers.yml b/roles/overcloud-prep-containers/tasks/overcloud-prep-containers.yml index 5f502a76b..74b44cb63 100644 --- a/roles/overcloud-prep-containers/tasks/overcloud-prep-containers.yml +++ b/roles/overcloud-prep-containers/tasks/overcloud-prep-containers.yml @@ -1,8 +1,14 @@ --- - when: update_containers|bool block: - - name: Install python-setuptools - yum: + - name: check if python setup tool is installed + shell: command -v easy-install >/dev/null 2>&1 + register: easy_install_exists + ignore_errors: yes + + - when: easy_install_exists.rc == 1 + name: Install python setuptools + package: name: python-setuptools state: latest become: true diff --git a/roles/validate-tempest/tasks/tempest-venv.yml b/roles/validate-tempest/tasks/tempest-venv.yml index 3d88f53a5..b89603762 100644 --- a/roles/validate-tempest/tasks/tempest-venv.yml +++ b/roles/validate-tempest/tasks/tempest-venv.yml @@ -20,12 +20,23 @@ version: '{{ tempest_conf_version }}' when: release != 'newton' + +- name: Check if virtualenv is in the system + shell: command -v virtualenv >/dev/null 2>&1 + register: virtualenv_exist + ignore_errors: yes + +- when: virtualenv_exist.rc == 1 + name: Install virtualenv + package: + name: python-virtualenv + state: present + - name: Install packages required for create venv package: name={{ item }} state=present with_items: - libffi-devel - openssl-devel - - python-virtualenv - gcc - name: Set tempest init command