Merge pull request theforeman#1 from apenney/master

Changes for Puppet 2.7
vStone · Mar 10, 2012 · 647b1e2 · 647b1e2
2 parents 5badf50 + a6639c8
commit 647b1e2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -1,8 +1,8 @@
 class foreman_proxy::install {
-  require 'foreman::params'
+  include foreman::params
   include foreman::install::repos
   package {'foreman-proxy':
-    ensure  => latest,
+    ensure  => present,
     require => Class['foreman::install::repos'],
   }
 }
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -1,4 +1,7 @@
 class foreman_proxy::params {
+
+  include tftp::params
+
   # variables
   $dir  = '/usr/share/foreman-proxy'
   $user = 'foreman-proxy'
@@ -15,7 +18,6 @@
   $puppetrun_cmd = '/usr/sbin/puppetrun'
 
   # TFTP settings
-  require 'tftp'  # ensures we can access tftp module parameters
   $tftp           = true
   $syslinux_root  = '/usr/share/syslinux'
   $syslinux_files = ['pxelinux.0','menu.c32','chain.c32']

diff --git a/manifests/tftp.pp b/manifests/tftp.pp
@@ -1,5 +1,6 @@
 class foreman_proxy::tftp {
   include ::tftp
+  include foreman_proxy::params
 
   file{ $foreman_proxy::params::tftp_dir:
     ensure  => directory,