summaryrefslogtreecommitdiff
path: root/puppet/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-01-28 00:04:10 +0100
committervarac <varacanero@zeromail.org>2016-01-28 23:52:41 +0100
commita8343508a6ced1dcbca621ad4c6f3ac39676326b (patch)
treebe4c0b141f9fb1647841c6ac65a9169d8faaf2e3 /puppet/manifests
parent54bd11793c13140651d908db7f88d550712ee85a (diff)
[feat] Fix fast deploy using 'leap deploy --fast'
This worked before, but somehow stopped working. We need to include 'site_config::slow' top-level scope instead of including it in 'site_config::default', because otherwise it would get tagged with 'leap_base', and would be included always. This way 'site_config::slow' gets included by default, but can be excluded by using 'leap deploy --fast'. See https://leap.se/en/docs/platform/details/under-the-hood#tags - Resolves: #7844
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/site.pp9
1 files changed, 9 insertions, 0 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 6bafff8e..f012d6c8 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -11,6 +11,15 @@ $services = hiera('services', [])
$services_str = join($services, ', ')
notice("Services for ${fqdn}: ${services_str}")
+# In the default deployment case, we want to run an 'apt-get dist-upgrade'
+# to ensure the latest packages are installed. This is done by including the
+# class 'site_config::slow' here. However, you only changed a small bit of
+# the platform and want to skip this slow part of deployment, you can do that
+# by using 'leap deploy --fast' which will only apply those resources that are
+# tagged with 'leap_base' or 'leap_service'.
+# See https://leap.se/en/docs/platform/details/under-the-hood#tags
+include site_config::slow
+
if member($services, 'openvpn') {
include site_openvpn
}