From 15d181f4b4ca12cb6b903f62669f65ac3797b80d Mon Sep 17 00:00:00 2001
From: Glauco Oliveira <gvinici@thoughtworks.com>
Date: Fri, 4 Sep 2015 10:26:21 -0300
Subject: [PATCH] Fix apt issue.

During the testing, we noticed that apt::ppa was failing for two
reasons:
- it was being used without including the module
- it was not updating the package list after including the ppa.

We then included the apt module in the beginning and required an apt
update before installing the packages.

Change-Id: I13ed3711314154d2267e96add6f48dce3f3dfc84
Co-Authored-By: Bruno Tavares <btavare@thoughtworks.com>
---
 manifests/init.pp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index f6fea11..958e716 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -16,6 +16,7 @@
 #
 class diskimage_builder () {
   include ::pip
+  include ::apt
 
   $packages = [
     'debian-keyring',
@@ -29,12 +30,16 @@ class diskimage_builder () {
     'yum-utils',
   ]
 
-  package { $packages:
-    ensure  => present,
-    require => Apt::Ppa['ppa:openstack-ci-core/vhd-util'],
+  apt::ppa { 'ppa:openstack-ci-core/vhd-util':
   }
 
-  apt::ppa { 'ppa:openstack-ci-core/vhd-util': }
+  package { $packages:
+    ensure  => present,
+    require => [
+      Apt::Ppa['ppa:openstack-ci-core/vhd-util'],
+      Class['apt::update'],
+    ],
+  }
 
   # required by the diskimage-builder element scripts
   if ! defined(Package['python-yaml']) {