renamed tftp class to avoid class name space issues

ohadlevy · Aug 9, 2011 · b4fe12b · b4fe12b
1 parent 1540027
commit b4fe12b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/foreman/manifests/proxy.pp b/foreman/manifests/proxy.pp
@@ -6,7 +6,7 @@
 
   include foreman::proxy::puppetca
   include foreman::proxy::puppetrun
-  include foreman::proxy::tftp
+  include foreman::proxy::tftp-deploy
 
   package {"foreman-proxy": ensure => installed}
 

diff --git a/foreman/manifests/proxy/tftp.pp → foreman/manifests/proxy/tftp-deploy.pp b/foreman/manifests/proxy/tftp.pp → foreman/manifests/proxy/tftp-deploy.pp
@@ -1,7 +1,7 @@
-class foreman::proxy::tftp {
+class foreman::proxy::tftp-deploy {
   include tftp
 
-  $syslinux_root  = "/usr/lib/syslinux"
+  $syslinux_root  = "/usr/share/syslinux"
   $syslinux_files = ["pxelinux.0","menu.c32","chain.c32"]
   $tftproot       = "/var/lib/tftpboot"
   $tftp_dir       = ["${tftproot}/pxelinux.cfg","${tftproot}/build"]
@@ -20,5 +20,6 @@
   link_file{$syslinux_files:
     source_path => $syslinux_root,
     target_path => $tftproot,
+    require     => Class["tftp::install"];
   }
 }