diff options
| author | Micah Anderson <micah@leap.se> | 2014-04-22 14:13:46 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2014-04-22 14:13:46 -0400 |
| commit | 327d5c934e408f90011d7949b89ab01fed88998e (patch) | |
| tree | 77cfefffc8f9ffe160c4413b26dd5ca5cdd6f1e8 /puppet/manifests/setup.pp | |
| parent | ca11482dd7cd4ea8ffa69407ee2fd5b5e1b7981b (diff) | |
| parent | 4295f334ea4f92d7fb47f7121a42633630c368d1 (diff) | |
Merge branch 'develop' (0.5.0)
Conflicts:
.gitignore
Change-Id: I778f3e1f1f4832f5894bc149ead67e9a4becf304
Diffstat (limited to 'puppet/manifests/setup.pp')
| -rw-r--r-- | puppet/manifests/setup.pp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/puppet/manifests/setup.pp b/puppet/manifests/setup.pp index 80e7ffc2..4dd03203 100644 --- a/puppet/manifests/setup.pp +++ b/puppet/manifests/setup.pp @@ -1,16 +1,5 @@ # # this is applied before each run of site.pp # -$services = '' - -Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' } - -include site_config::hosts - -include site_apt - -package { 'facter': - ensure => latest, - require => Exec['refresh_apt'] -} +include ::site_config::setup |