diff options
| author | varac <varacanero@zeromail.org> | 2013-06-21 16:27:48 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-06-21 16:27:48 +0200 |
| commit | 52c79fd7d25c33637197f08a8b7736fdc8a83414 (patch) | |
| tree | cc1c56084ac462b38c3b8cadc3b6e1e75a9c62d6 | |
| parent | 8259e18e06fe1535ad931e4c45dfe2583443f162 (diff) | |
| parent | e085e66f0f1c045b0282f738f4501e7a1d2fd301 (diff) | |
Merge remote-tracking branch 'micah/bug/2942' into develop
| -rw-r--r-- | puppet/manifests/setup.pp | 11 | ||||
| -rw-r--r-- | puppet/modules/site_apt/manifests/init.pp | 5 |
2 files changed, 15 insertions, 1 deletions
diff --git a/puppet/manifests/setup.pp b/puppet/manifests/setup.pp index b45c8b4c..6adb1948 100644 --- a/puppet/manifests/setup.pp +++ b/puppet/manifests/setup.pp @@ -1,4 +1,13 @@ # # this is applied before each run of site.pp # -include site_config::hosts
\ No newline at end of file +$services = '' +include site_config::hosts + +include site_apt + +package { 'facter': + ensure => latest, + require => Exec['refresh_apt'] +} + diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index c5f37014..c33b7a84 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -23,4 +23,9 @@ class site_apt { content => template('site_apt/secondary.list'); } + apt::preferences_snippet { 'facter': + release => "${::lsbdistcodename}-backports", + priority => 999 + } + } |