From 7913a465d292d2e90d52de061e3ff733ea4a8eaa Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Sat, 9 May 2015 16:14:39 +0200
Subject: consolidate

---
 global/overlay/etc/puppet/modules/sunet/manifests/cloudimage.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/cloudimage.pp b/global/overlay/etc/puppet/modules/sunet/manifests/cloudimage.pp
index a232b61..826d97a 100644
--- a/global/overlay/etc/puppet/modules/sunet/manifests/cloudimage.pp
+++ b/global/overlay/etc/puppet/modules/sunet/manifests/cloudimage.pp
@@ -24,10 +24,10 @@ define sunet::cloudimage (
   $image_url_a = split($image_url,"/")
   $image_name = $image_url_a[-1]
   $image_src = "/var/lib/libvirt/images/${image_name}"
+  file { "/var/lib/libvirt/images/${name}": ensure => directory } ->
   exec {"wget -O${image_src} ${image_url}":
      onlyif => "test ! -f ${image_src}"
   }
-  file { "/var/lib/libvirt/images": ensure => directory } ->
   file { "/var/lib/libvirt/images/${name}/${name}-init.sh":
      content => template("sunet/cloudimage/mk_cloud_image.erb"),
      mode    => "0755"
-- 
cgit v1.1