From 39ab1c3b5ddd5cc554b5ecc9df31facbbe653e30 Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Fri, 20 Apr 2018 11:28:36 -0500 Subject: [PATCH] Gate: Improve centos support This PS updates the CentOS Gate. Change-Id: Ic29b9e5949fb3fb3433802f7933208f3cabfef72 --- .../tasks/deploy-ansible-docker-support.yaml | 11 ----------- tools/gate/devel/start.sh | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/roles/deploy-docker/tasks/deploy-ansible-docker-support.yaml b/roles/deploy-docker/tasks/deploy-ansible-docker-support.yaml index 3e7a8e130..b220f0272 100644 --- a/roles/deploy-docker/tasks/deploy-ansible-docker-support.yaml +++ b/roles/deploy-docker/tasks/deploy-ansible-docker-support.yaml @@ -23,17 +23,6 @@ - name: fix docker removal issue with ansible's docker_container on centos when: ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux' block: - - name: remove requests and urllib3 pip packages to fix docker removal issue with ansible's docker_container on centos - become: true - become_user: root - include_role: - name: deploy-package - tasks_from: pip - vars: - state: absent - packages: - - requests - - urllib3 - name: remove requests and urllib3 distro packages to fix docker removal issue with ansible's docker_container on centos become: true become_user: root diff --git a/tools/gate/devel/start.sh b/tools/gate/devel/start.sh index fdf32c168..3f6b617f1 100755 --- a/tools/gate/devel/start.sh +++ b/tools/gate/devel/start.sh @@ -56,7 +56,7 @@ function ansible_install { sudo -H -E pip install --no-cache-dir --upgrade pip sudo -H -E pip install --no-cache-dir --upgrade setuptools sudo -H -E pip install --no-cache-dir --upgrade pyopenssl - sudo -H -E pip install --no-cache-dir \ + sudo -H -E pip install --no-cache-dir --upgrade \ ansible \ ara \ yq