diff options
author | Micah Anderson <micah@riseup.net> | 2013-06-25 11:39:45 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2013-06-25 11:39:45 -0400 |
commit | 27655b133ddbd5443e23a0f52b5ee353f53d0459 (patch) | |
tree | 905081054af821dfeed34fcd10ae3740733f8ac4 /puppet/modules | |
parent | c69053bffc18f277e1119efcf9fff3d1e95de7fa (diff) | |
parent | e61c7dfe1aa0ba4b5fc5fef2fd64d9fb2f1d2784 (diff) |
Merge remote-tracking branch 'varac_codecoop/feature/install_packages_after_refresh_apt' into develop
Diffstat (limited to 'puppet/modules')
m--------- | puppet/modules/apt | 0 | ||||
-rw-r--r-- | puppet/modules/site_apt/manifests/init.pp | 13 |
2 files changed, 13 insertions, 0 deletions
diff --git a/puppet/modules/apt b/puppet/modules/apt -Subproject 88bfe5fbab79b23a3f1d19c6283bdb2efd28598 +Subproject f11e3d475345059220402a44a97da491c85d2b5 diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index c5f37014..0da7f3be 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -23,4 +23,17 @@ class site_apt { content => template('site_apt/secondary.list'); } + apt::preferences_snippet { 'facter': + release => "${::lsbdistcodename}-backports", + priority => 999 + } + + # All packages should be installed _after_ refresh_apt is called, + # which does an apt-get update. + # There is one exception: + # The creation of sources.list depends on the lsb package + + File['/etc/apt/preferences'] -> + Exec['refresh_apt'] + Package <| ( title != 'lsb' ) |> } |