Consume puppet-diskimage_builder

Rather than having the diskimage-builder config sprinkled in here,
it's been split into its own module. Consume that module.

Depends-On: Idaac8b1e2ff3e3705bd50b76e48f5d12b743244c
Change-Id: I822ddd1041c1207a3d82d4864cf020d4db7ccc43

manifests/init.pp

@@ -35,12 +35,6 @@ class nodepool (
   $logging_conf_template = 'nodepool/nodepool.logging.conf.erb',
 ) {
 
-  # required by the nodepool diskimage-builder element scripts
-  if ! defined(Package['python-yaml']) {
-    package { 'python-yaml':
-      ensure => present,
-    }
-  }
 
   class { 'mysql::server':
     config_hash => {
@@ -69,17 +63,7 @@ class nodepool (
     'build-essential',
     'libffi-dev',
     'libssl-dev',
-    'kpartx',
-    'qemu-utils',
     'libgmp-dev',         # transitive dep of paramiko
-    # debootstrap is needed for building Debian images
-    'debootstrap',
-    'debian-keyring',
-    'ubuntu-keyring',
-    'vhd-util',
-    'yum',
-    'yum-utils',
-    'python-lzma',
     # xml2 and xslt are needed to build python lxml.
     'libxml2-dev',
     'libxslt-dev',
@@ -87,11 +71,8 @@ class nodepool (
 
   package { $packages:
     ensure  => present,
-    require => Apt::Ppa['ppa:openstack-ci-core/vhd-util'],
   }
 
-  apt::ppa { 'ppa:openstack-ci-core/vhd-util': }
-
   file { '/etc/mysql/conf.d/max_connections.cnf':
     ensure  => present,
     content => "[server]\nmax_connections = 8192\n",
@@ -120,14 +101,7 @@ class nodepool (
     source   => $git_source_repo,
   }
 
-  package { 'diskimage-builder':
+  include diskimage_builder
-    ensure   => latest,
-    provider => pip,
-    require  => [
-      Class['pip'],
-      Package['python-yaml'],
-    ],
-  }
 
   include pip
   exec { 'install_nodepool' :

metadata.json

@@ -9,6 +9,7 @@
   "issues_url": "https://storyboard.openstack.org/#!/project/765",
   "dependencies": [
     {"name":"puppetlabs/apt", "version_requirement": "<2.0.0"},
-    {"name":"openstackinfra/vcsrepo","version_requirement":">= 0.0.8"}
+    {"name":"openstackinfra/vcsrepo","version_requirement":">= 0.0.8"},
+    {"name":"openstackinfra/diskimage_builder"}
   ]
 }