From d1c6b9f0c0d0b0d8d08f2796cf99b085a74d1654 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Tue, 1 Mar 2016 19:17:30 -0500
Subject: [PATCH] Switch to package module

This will reduce the need to debian / redhat specific logic.

Change-Id: Ib0b0ee7e7d27981aacf496b5979da6e77eb2cb65
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 tasks/install.yaml        | 17 +++++++++++++----
 tasks/install/debian.yaml | 20 --------------------
 tasks/install/redhat.yaml | 27 ---------------------------
 3 files changed, 13 insertions(+), 51 deletions(-)
 delete mode 100644 tasks/install/debian.yaml
 delete mode 100644 tasks/install/redhat.yaml

diff --git a/tasks/install.yaml b/tasks/install.yaml
index 9743023..58abc22 100644
--- a/tasks/install.yaml
+++ b/tasks/install.yaml
@@ -17,10 +17,19 @@
     jenkins_job_builder_build_depends: "{{ __jenkins_job_builder_build_depends | list }}"
   when: jenkins_job_builder_build_depends is not defined
 
-- include: install/debian.yaml
-  when: ansible_os_family == 'Debian'
+# 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'
 
-- include: install/redhat.yaml
-  when: ansible_os_family == 'RedHat'
+- name: Ensure build dependencies are installed.
+  package:
+    name: "{{ item }}"
+    state: installed
+  with_items: "{{ jenkins_job_builder_build_depends }}"
+  when: jenkins_job_builder_install_method == 'git' or jenkins_job_builder_install_method == 'pip'
 
 - include: "install/{{ jenkins_job_builder_install_method }}.yaml"
diff --git a/tasks/install/debian.yaml b/tasks/install/debian.yaml
deleted file mode 100644
index c9458c0..0000000
--- a/tasks/install/debian.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2015 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
----
-- name: Ensure build dependencies are installed.
-  apt:
-    pkg: "{{ item }}"
-    state: installed
-  with_items: "{{ jenkins_job_builder_build_depends }}"
-  when: jenkins_job_builder_install_method == 'git' or jenkins_job_builder_install_method == 'pip'
diff --git a/tasks/install/redhat.yaml b/tasks/install/redhat.yaml
deleted file mode 100644
index c93ee90..0000000
--- a/tasks/install/redhat.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2015 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
----
-# NOTE(pabelanger): This needs to be here for now, since we need python-pip.
-- name: Ensure EPEL is enabled.
-  yum:
-    pkg: epel-release
-    state: installed
-  when: jenkins_job_builder_install_method == 'git' or jenkins_job_builder_install_method == 'pip'
-
-- name: Ensure build dependencies are installed.
-  yum:
-    pkg: "{{ item }}"
-    state: installed
-  with_items: "{{ jenkins_job_builder_build_depends }}"
-  when: jenkins_job_builder_install_method == 'git' or jenkins_job_builder_install_method == 'pip'