Switch to package module

This will help reduce duplicate code.

Change-Id: Icf8729a53dfa046e8dbdcc15faa7579b995f4081
Signed-off-by: Paul Belanger <pabelanger@redhat.com>

tasks/install.yaml

@@ -17,11 +17,20 @@
     zuul_build_depends: "{{ __zuul_build_depends | list }}"
   when: zuul_build_depends is not defined
 
-- include: install/debian.yaml
+# NOTE(pabelanger): This needs to be here for now, since we need python-pip.
-  when: ansible_os_family == 'Debian'
+- name: Ensure EPEL is enabled.
+  package:
+    name: epel-release
+    state: installed
+  when: (zuul_install_method == 'git' or zuul_install_method == 'pip') and
+        ansible_os_family == 'RedHat'
 
-- include: install/redhat.yaml
+- name: Ensure build dependencies are installed.
-  when: ansible_os_family == 'RedHat'
+  package:
+    name: "{{ item }}"
+    state: installed
+  with_items: zuul_build_depends
+  when: zuul_install_method == 'git' or zuul_install_method == 'pip'
 
 - include: install/git.yaml
   when: zuul_install_method == 'git'

tasks/install/debian.yaml

@@ -1,18 +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: zuul_build_depends
-  when: zuul_install_method == 'git' or zuul_install_method == 'pip'

tasks/install/redhat.yaml

@@ -1,25 +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: zuul_install_method == 'git' or zuul_install_method == 'pip'
-
-- name: Ensure build dependencies are installed.
-  yum: "pkg={{ item }} state=installed"
-  with_items: zuul_build_depends
-  when: zuul_install_method == 'git' or zuul_install_method == 'pip'