Add support for pkg install_method

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

tasks/install.yaml

@@ -22,6 +22,11 @@
     diskimage_builder_depends: "{{ __diskimage_builder_depends | list }}"
   when: diskimage_builder_depends is not defined
 
+- name: Define diskimage_builder_pkg_name
+  set_fact:
+    diskimage_builder_pkg_name: "{{ __diskimage_builder_pkg_name }}"
+  when: diskimage_builder_pkg_name is not defined
+
 - include: install/debian.yaml
   when: ansible_os_family == 'Debian'
 

tasks/install/debian.yaml

@@ -13,10 +13,21 @@
 # under the License.
 ---
 - name: Ensure build dependencies are installed.
-  apt: "pkg={{ item }} state=installed"
+  apt:
+    pkg: "{{ item }}"
+    state: installed
   with_items: diskimage_builder_build_depends
   when: diskimage_builder_install_method == 'git' or diskimage_builder_install_method == 'pip'
 
 - name: Ensure dependencies are installed.
-  apt: "pkg={{ item }} state=installed"
+  apt:
+    pkg: "{{ item }}"
+    state: installed
   with_items: diskimage_builder_depends
+  when: diskimage_builder_install_method == 'git' or diskimage_builder_install_method == 'pip'
+
+- name: Install diskimage-builder using apt.
+  apt:
+    pkg: "{{ diskimage_builder_pkg_name }}"
+    state: installed
+  when: diskimage_builder_install_method == 'pkg'

tasks/install/redhat.yaml

@@ -20,10 +20,21 @@
   when: diskimage_builder_install_method == 'git' or diskimage_builder_install_method == 'pip'
 
 - name: Ensure build dependencies are installed.
-  yum: "pkg={{ item }} state=installed"
+  yum:
+    pkg: "{{ item }}"
+    state: installed
   with_items: diskimage_builder_build_depends
   when: diskimage_builder_install_method == 'git' or diskimage_builder_install_method == 'pip'
 
 - name: Ensure dependencies are installed.
-  yum: "pkg={{ item }} state=installed"
+  yum:
+    pkg: "{{ item }}"
+    state: installed
   with_items: diskimage_builder_depends
+  when: diskimage_builder_install_method == 'git' or diskimage_builder_install_method == 'pip'
+
+- name: Install diskimage-builder using yum.
+  yum:
+    pkg: "{{ diskimage_builder_pkg_name }}"
+    state: installed
+  when: diskimage_builder_install_method == 'pkg'

vars/Debian.yaml

@@ -21,3 +21,5 @@ __diskimage_builder_depends:
   - kpartx
   - qemu-utils
   - uuid-runtime
+
+__diskimage_builder_pkg_name: python-diskimage-builder

vars/RedHat.yaml

@@ -20,3 +20,5 @@ __diskimage_builder_depends:
   - debootstrap
   - kpartx
   - qemu-img
+
+__diskimage_builder_pkg_name: diskimage-builder