summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-02-01 17:35:16 +0100
committerkwadronaut <kwadronaut@leap.se>2016-02-02 19:38:35 +0100
commit5471630d583d21bc21ec1e6a1e17056c2bdecb23 (patch)
tree5f02d8788d4f9039b62991202d9c561f54d3e387 /puppet/modules
parent559b2ccaa71e2c5c459d7a6bea39de975f15cb1c (diff)
[refactor] Dont duplicate Package resource override
`site_apt` aready ensures for installing packages after Exec[update_apt] is run, so we don't need to duplicate this in `site_config::default.pp`.
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_apt/manifests/init.pp8
-rw-r--r--puppet/modules/site_config/manifests/default.pp12
2 files changed, 3 insertions, 17 deletions
diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index 04b1ce69..447e1781 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -52,10 +52,8 @@ class site_apt {
pin => 'origin "deb.leap.se"'
}
-# All packages should be installed _after_ refresh_apt is called,
-# which does an apt-get update.
-
- Exec['apt_updated'] ->
- Package <||>
+ # All packages should be installed after 'update_apt' is called,
+ # which does an 'apt-get update'.
+ Exec['update_apt'] -> Package <||>
}
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index b5d0f32d..256de1a1 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -7,18 +7,6 @@ class site_config::default {
include site_config::params
include site_config::setup
- # By default, the class 'site_config::slow' is included in site.pp.
- # It basically does an 'apt-get update' and 'apt-get dist-upgrade'.
- # This class can be excluded by using 'leap deploy --fast',
- # see https://leap.se/en/docs/platform/details/under-the-hood#tags for more
- # details.
- # The following Package resource override makes sure that *if* an
- # 'apt-get update' is executed by 'site_config::slow', it should be done
- # before any packages are installed.
-
- Package { require => Exec['apt_updated'] }
-
-
# default class, used by all hosts
include lsb, git