Depend on ansible-role-diskimage-builder

Break out diskimage-builder into its own role. This will allow the
user to better control diskimage-builder settings.

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

meta/main.yaml

@@ -132,8 +132,5 @@ galaxy_info:
   #- packaging
   #- system
   #- web
-dependencies: []
-  # List your role dependencies here, one per line.
-  # Be sure to remove the '[]' above if you add dependencies
-  # to this list.
-  
+dependencies:
+  - role: ansible-role-diskimage-builder

tasks/install.yaml

@@ -4,11 +4,6 @@
     nodepool_build_depends: "{{ __nodepool_build_depends | list }}"
   when: nodepool_build_depends is not defined
 
-- name: Define nodepool_depends.
-  set_fact:
-    nodepool_depends: "{{ __nodepool_depends | list }}"
-  when: nodepool_depends is not defined
-
 - include: install/debian.yaml
   when: ansible_os_family == 'Debian'
 

tasks/install/debian.yaml

@@ -3,7 +3,3 @@
   apt: "pkg={{ item }} state=installed"
   with_items: nodepool_build_depends
   when: nodepool_install_method == 'git' or nodepool_install_method == 'pip'
-
-- name: Ensure dependencies are installed.
-  apt: "pkg={{ item }} state=installed"
-  with_items: nodepool_depends

tasks/install/redhat.yaml

@@ -10,7 +10,3 @@
   yum: "pkg={{ item }} state=installed"
   with_items: nodepool_build_depends
   when: nodepool_install_method == 'git' or nodepool_install_method == 'pip'
-
-- name: Ensure dependencies are installed.
-  yum: "pkg={{ item }} state=installed"
-  with_items: nodepool_depends

tasks/service/redhat.yaml

@@ -13,4 +13,5 @@
   service:
     enabled: yes
     name: nodepool
-    state: started
+  notify:
+    - Restart nodepool

vars/Debian.yaml

@@ -6,9 +6,3 @@ __nodepool_build_depends:
   - python-dev
   - python-pip
   - zlib1g-dev
-
-__nodepool_depends:
-  - debootstrap
-  - kpartx
-  - qemu-utils
-  - uuid-runtime

vars/RedHat.yaml

@@ -10,8 +10,3 @@ __nodepool_build_depends:
   - python-devel
   - python-pip
   - zlib-devel
-
-__nodepool_depends:
-  - debootstrap
-  - kpartx
-  - qemu-img