From 2c920229c465378ce7374892a08f70b3bf0bb973 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Tue, 16 Feb 2016 09:11:27 -0500
Subject: [PATCH] Create package install_method

This bring it inline with git and pip.

Change-Id: I4f1c113abdd9b48112b68e4564cd5580dde7ae67
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 defaults/main.yaml         |  2 +-
 tasks/install/debian.yaml  |  6 ------
 tasks/install/package.yaml | 18 ++++++++++++++++++
 tasks/install/redhat.yaml  |  6 ------
 4 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 tasks/install/package.yaml

diff --git a/defaults/main.yaml b/defaults/main.yaml
index dbc31be..d5c6fe1 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -48,7 +48,7 @@ jenkins_job_builder_install_method: git
 jenkins_job_builder_pip_name: jenkins-job-builder
 jenkins_job_builder_pip_version:
 
-jenkins_job_builder_pkg_name: python-jenkins-job-builder
+jenkins_job_builder_package_name: python-jenkins-job-builder
 
 # handlers/main.yaml
 jenkins_job_builder_handler_check_delay: 10
diff --git a/tasks/install/debian.yaml b/tasks/install/debian.yaml
index e6555f0..77c592b 100644
--- a/tasks/install/debian.yaml
+++ b/tasks/install/debian.yaml
@@ -18,9 +18,3 @@
     state: installed
   with_items: jenkins_job_builder_build_depends
   when: jenkins_job_builder_install_method == 'git' or jenkins_job_builder_install_method == 'pip'
-
-- name: Install jenkins-job-builder using apt.
-  apt:
-    pkg: "{{ jenkins_job_builder_pkg_name }}"
-    state: installed
-  when: jenkins_job_builder_install_method == 'pkg'
diff --git a/tasks/install/package.yaml b/tasks/install/package.yaml
new file mode 100644
index 0000000..5440a1e
--- /dev/null
+++ b/tasks/install/package.yaml
@@ -0,0 +1,18 @@
+# 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: Install jenkins-job-builder from package.
+  package:
+    name: "{{ jenkins_job_builder_package_name }}"
+    state: installed
diff --git a/tasks/install/redhat.yaml b/tasks/install/redhat.yaml
index 9b68f4a..17792d3 100644
--- a/tasks/install/redhat.yaml
+++ b/tasks/install/redhat.yaml
@@ -25,9 +25,3 @@
     state: installed
   with_items: jenkins_job_builder_build_depends
   when: jenkins_job_builder_install_method == 'git' or jenkins_job_builder_install_method == 'pip'
-
-- name: Install jenkins-job-builder using yum.
-  yum:
-    pkg: "{{ jenkins_job_builder_pkg_name }}"
-    state: installed
-  when: jenkins_job_builder_install_method == 'pkg'