diff --git a/README.rst b/README.rst index f428068..fb3340a 100644 --- a/README.rst +++ b/README.rst @@ -20,6 +20,8 @@ auditing easier. Requirements ------------ +See `bindep.txt` for role dependencies. + Packages ~~~~~~~~ diff --git a/bindep.txt b/bindep.txt index e69de29..cac9e3d 100644 --- a/bindep.txt +++ b/bindep.txt @@ -0,0 +1,4 @@ +# This is a cross-platform list tracking distribution packages needed by tests; +# see http://docs.openstack.org/infra/bindep/ for additional information. + +python-pip diff --git a/tasks/install.yaml b/tasks/install.yaml index 58abc22..c4f5de0 100644 --- a/tasks/install.yaml +++ b/tasks/install.yaml @@ -17,14 +17,6 @@ jenkins_job_builder_build_depends: "{{ __jenkins_job_builder_build_depends | list }}" when: jenkins_job_builder_build_depends is not defined -# NOTE(pabelanger): This needs to be here for now, since we need python-pip. -- name: Ensure EPEL is enabled. - package: - name: epel-release - state: installed - when: (jenkins_job_builder_install_method == 'git' or jenkins_job_builder_install_method == 'pip') and - ansible_os_family == 'RedHat' - - name: Ensure build dependencies are installed. package: name: "{{ item }}" diff --git a/vars/Debian.yaml b/vars/Debian.yaml index 257aff1..7224380 100644 --- a/vars/Debian.yaml +++ b/vars/Debian.yaml @@ -28,4 +28,3 @@ __jenkins_job_builder_build_depends: - git - python-dev - - python-pip diff --git a/vars/RedHat.yaml b/vars/RedHat.yaml index d0b041f..a80761e 100644 --- a/vars/RedHat.yaml +++ b/vars/RedHat.yaml @@ -15,4 +15,3 @@ __jenkins_job_builder_build_depends: - git - python-devel - - python-pip