aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-04-05 02:07:58 +0000
committerMichael Scherer <misc@mageia.org>2011-04-05 02:07:58 +0000
commitee683c7ad5cf594d3068deaea28cf24096701cb3 (patch)
treed83e328972b55034230a97787913bc3c7b691c7e /modules
parent0e6a52030519b30b5b3c35abc39832bf59872f92 (diff)
downloadpuppet-ee683c7ad5cf594d3068deaea28cf24096701cb3.tar
puppet-ee683c7ad5cf594d3068deaea28cf24096701cb3.tar.gz
puppet-ee683c7ad5cf594d3068deaea28cf24096701cb3.tar.bz2
puppet-ee683c7ad5cf594d3068deaea28cf24096701cb3.tar.xz
puppet-ee683c7ad5cf594d3068deaea28cf24096701cb3.zip
move the download class to auto_installation, as it doesn't belong to libvirt module
Diffstat (limited to 'modules')
-rw-r--r--modules/auto_installation/manifests/download.rb (renamed from modules/libvirtd/manifests/download.rb)0
-rw-r--r--modules/auto_installation/manifests/init.pp4
-rw-r--r--modules/libvirtd/manifests/init.pp1
3 files changed, 4 insertions, 1 deletions
diff --git a/modules/libvirtd/manifests/download.rb b/modules/auto_installation/manifests/download.rb
index d0e6821b..d0e6821b 100644
--- a/modules/libvirtd/manifests/download.rb
+++ b/modules/auto_installation/manifests/download.rb
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/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