summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Belanger <pabelanger@redhat.com>2016-09-03 22:32:17 -0400
committerPaul Belanger <pabelanger@redhat.com>2016-09-04 09:58:58 -0400
commit96c22991b10b4d1d6daab315ad2415f60b989ebc (patch)
treebddec6927a770c1d306bed85bbfbdb88c27f58a5
parent1c1dfefb0c5596ff63980eb96885181963ebe29e (diff)
Remove epel-release / python-pip from role
These are dependencies our role requires. As such, they should be installed by the user. Change-Id: I890cfce79d1d386cfccc33a2e01e35800833c7de Signed-off-by: Paul Belanger <pabelanger@redhat.com>
Notes
Notes (review): Code-Review+2: Paul Belanger <pabelanger@redhat.com> Workflow+1: Paul Belanger <pabelanger@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Sun, 04 Sep 2016 14:22:50 +0000 Reviewed-on: https://review.openstack.org/365339 Project: openstack/ansible-role-jenkins-job-builder Branch: refs/heads/master
-rw-r--r--README.rst2
-rw-r--r--bindep.txt4
-rw-r--r--tasks/install.yaml8
-rw-r--r--vars/Debian.yaml1
-rw-r--r--vars/RedHat.yaml1
5 files changed, 6 insertions, 10 deletions
diff --git a/README.rst b/README.rst
index f428068..fb3340a 100644
--- a/README.rst
+++ b/README.rst
@@ -20,6 +20,8 @@ auditing easier.
20Requirements 20Requirements
21------------ 21------------
22 22
23See `bindep.txt` for role dependencies.
24
23Packages 25Packages
24~~~~~~~~ 26~~~~~~~~
25 27
diff --git a/bindep.txt b/bindep.txt
index e69de29..cac9e3d 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -0,0 +1,4 @@
1# This is a cross-platform list tracking distribution packages needed by tests;
2# see http://docs.openstack.org/infra/bindep/ for additional information.
3
4python-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 @@
17 jenkins_job_builder_build_depends: "{{ __jenkins_job_builder_build_depends | list }}" 17 jenkins_job_builder_build_depends: "{{ __jenkins_job_builder_build_depends | list }}"
18 when: jenkins_job_builder_build_depends is not defined 18 when: jenkins_job_builder_build_depends is not defined
19 19
20# NOTE(pabelanger): This needs to be here for now, since we need python-pip.
21- name: Ensure EPEL is enabled.
22 package:
23 name: epel-release
24 state: installed
25 when: (jenkins_job_builder_install_method == 'git' or jenkins_job_builder_install_method == 'pip') and
26 ansible_os_family == 'RedHat'
27
28- name: Ensure build dependencies are installed. 20- name: Ensure build dependencies are installed.
29 package: 21 package:
30 name: "{{ item }}" 22 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 @@
28__jenkins_job_builder_build_depends: 28__jenkins_job_builder_build_depends:
29 - git 29 - git
30 - python-dev 30 - python-dev
31 - 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 @@
15__jenkins_job_builder_build_depends: 15__jenkins_job_builder_build_depends:
16 - git 16 - git
17 - python-devel 17 - python-devel
18 - python-pip