From bc0cb78b77559c64dcc744c3f8ab06ada8e006b2 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Sat, 27 Aug 2016 18:05:59 -0400
Subject: [PATCH] Remove epel-release / python-pip from role

These are dependencies our role requires. As such, they should be
installed by the user.

Change-Id: I736463187b3210ccada6b7c5f9202047ce6b0e86
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 README.rst         | 2 ++
 bindep.txt         | 1 +
 tasks/install.yaml | 9 ---------
 vars/Debian.yaml   | 1 -
 vars/RedHat.yaml   | 1 -
 5 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/README.rst b/README.rst
index 5f5d542..c75f4db 100644
--- a/README.rst
+++ b/README.rst
@@ -18,6 +18,8 @@ so that changes are only merged if they pass tests.
 Requirements
 ------------
 
+See `bindep.txt` for role dependencies.
+
 Packages
 ~~~~~~~~
 
diff --git a/bindep.txt b/bindep.txt
index 1b58618..8775f8a 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -2,3 +2,4 @@
 # see http://docs.openstack.org/infra/bindep/ for additional information.
 
 libselinux-python [platform:rpm]
+python-pip
diff --git a/tasks/install.yaml b/tasks/install.yaml
index 19e3b65..b586ea7 100644
--- a/tasks/install.yaml
+++ b/tasks/install.yaml
@@ -17,15 +17,6 @@
     zuul_build_depends: "{{ __zuul_build_depends | list }}"
   when: zuul_build_depends is not defined
 
-# NOTE(pabelanger): This needs to be here for now, since we need python-pip.
-- name: Ensure EPEL is enabled.
-  become: yes
-  package:
-    name: epel-release
-    state: installed
-  when: (zuul_install_method == 'git' or zuul_install_method == 'pip') and
-        ansible_os_family == 'RedHat'
-
 - name: Ensure build dependencies are installed.
   become: yes
   package:
diff --git a/vars/Debian.yaml b/vars/Debian.yaml
index 71643dd..f89fba5 100644
--- a/vars/Debian.yaml
+++ b/vars/Debian.yaml
@@ -15,7 +15,6 @@
 __zuul_build_depends:
   - git
   - python-dev
-  - python-pip
 
 __zuul_file_zuul_service_config_dest: /etc/default/zuul
 __zuul_file_zuul_service_config_mode: "0644"
diff --git a/vars/RedHat.yaml b/vars/RedHat.yaml
index 7285be2..fc5dcff 100644
--- a/vars/RedHat.yaml
+++ b/vars/RedHat.yaml
@@ -17,7 +17,6 @@ __zuul_build_depends:
   - gcc-c++
   - git
   - python-devel
-  - python-pip
 
 __zuul_file_zuul_service_config_dest: /etc/sysconfig/zuul
 __zuul_file_zuul_service_config_mode: "0644"