From ee683c7ad5cf594d3068deaea28cf24096701cb3 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Tue, 5 Apr 2011 02:07:58 +0000
Subject: move the download class to auto_installation, as it doesn't belong to
 libvirt module

---
 manifests/nodes.pp                              |  3 ++-
 modules/auto_installation/manifests/download.rb | 21 +++++++++++++++++++++
 modules/auto_installation/manifests/init.pp     |  4 ++++
 modules/libvirtd/manifests/download.rb          | 21 ---------------------
 modules/libvirtd/manifests/init.pp              |  1 -
 5 files changed, 27 insertions(+), 23 deletions(-)
 create mode 100644 modules/auto_installation/manifests/download.rb
 delete mode 100644 modules/libvirtd/manifests/download.rb

diff --git a/manifests/nodes.pp b/manifests/nodes.pp
index 2a57f951..4b2a6100 100644
--- a/manifests/nodes.pp
+++ b/manifests/nodes.pp
@@ -220,7 +220,8 @@ node rabbit {
         require => File[$netinst_iso_path],
     }
 
-    libvirtd::download::netboot_images { "mandriva":
+    include auto_installation::download
+    auto_installation::download::netboot_images { "mandriva":
         path => $netinst_iso_path,
         versions => ["2010.0","2010.1"],
         archs => ['i586','x86_64'],
diff --git a/modules/auto_installation/manifests/download.rb b/modules/auto_installation/manifests/download.rb
new file mode 100644
index 00000000..d0e6821b
--- /dev/null
+++ b/modules/auto_installation/manifests/download.rb
@@ -0,0 +1,21 @@
+define "libvirtd::download::netboot_images", :path, :versions, :archs, :mirror_path, :files do
+    # example :
+    # mandriva :
+    # ftp://ftp.free.fr/pub/Distributions_Linux/MandrivaLinux/devel/%{version}/%{arch}/isolinux/alt0/
+    for a in @archs do
+        for v in @versions do
+            # uncomment when ruby 1.9 will be stable and used 
+            # mirror_file_path = @mirror_path % { :arch => a, :version => v } 
+            mirror_file_path = @mirror_path.gsub(/%{arch}/, a)
+            mirror_file_path = mirror_file_path.gsub(/%{version}/, v)
+            for f in @files do 
+                file_name = "#{@path}/#{@name}_#{v}_#{a}_#{f}" 
+                create_resource(:exec, "wget -q #{mirror_file_path}/#{f} -O #{file_name}", 
+                                :creates => file_name) 
+            end
+        end
+    end
+end
+
+
+
diff --git a/modules/auto_installation/manifests/init.pp b/modules/auto_installation/manifests/init.pp
index 19c20680..7c5baf64 100644
--- a/modules/auto_installation/manifests/init.pp
+++ b/modules/auto_installation/manifests/init.pp
@@ -15,6 +15,10 @@ class auto_installation {
         $pxe_menu_dir = "$pxe_dir/pxelinux.cfg/m/"
     }
 
+    class download { 
+        import "download.rb"
+    }
+
     class pxe_menu inherits variables {
         package { 'syslinux':
 
diff --git a/modules/libvirtd/manifests/download.rb b/modules/libvirtd/manifests/download.rb
deleted file mode 100644
index d0e6821b..00000000
--- a/modules/libvirtd/manifests/download.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-define "libvirtd::download::netboot_images", :path, :versions, :archs, :mirror_path, :files do
-    # example :
-    # mandriva :
-    # ftp://ftp.free.fr/pub/Distributions_Linux/MandrivaLinux/devel/%{version}/%{arch}/isolinux/alt0/
-    for a in @archs do
-        for v in @versions do
-            # uncomment when ruby 1.9 will be stable and used 
-            # mirror_file_path = @mirror_path % { :arch => a, :version => v } 
-            mirror_file_path = @mirror_path.gsub(/%{arch}/, a)
-            mirror_file_path = mirror_file_path.gsub(/%{version}/, v)
-            for f in @files do 
-                file_name = "#{@path}/#{@name}_#{v}_#{a}_#{f}" 
-                create_resource(:exec, "wget -q #{mirror_file_path}/#{f} -O #{file_name}", 
-                                :creates => file_name) 
-            end
-        end
-    end
-end
-
-
-
diff --git a/modules/libvirtd/manifests/init.pp b/modules/libvirtd/manifests/init.pp
index 0fc8cf90..52475a42 100644
--- a/modules/libvirtd/manifests/init.pp
+++ b/modules/libvirtd/manifests/init.pp
@@ -1,6 +1,5 @@
 class libvirtd {
     class base {
-        import "download.rb"
         # make sure to use a recent enough version
         # dnsmasq-base -> for nat network
         # netcat-openbsd -> for ssh remote access
-- 
cgit v1.2.1