summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-12-15 21:43:57 +0100
committervarac <varacanero@zeromail.org>2015-12-15 21:43:57 +0100
commit8a8dcda0fa10a819a945c283ef998214e5807f86 (patch)
tree1869eb190ce9bdb05571382bc9d9b7bd68e20f77
parent73624f1e87974ab71b5d8e44073347725e492e5c (diff)
parentb383a34e7ae0f988bf942bd033d8795bd8ea71ac (diff)
Merge branch 'remove_run_stages' into develop
-rw-r--r--puppet/modules/site_config/manifests/setup.pp8
-rw-r--r--puppet/modules/site_config/manifests/slow.pp7
2 files changed, 9 insertions, 6 deletions
diff --git a/puppet/modules/site_config/manifests/setup.pp b/puppet/modules/site_config/manifests/setup.pp
index b09d0413..dba5fa14 100644
--- a/puppet/modules/site_config/manifests/setup.pp
+++ b/puppet/modules/site_config/manifests/setup.pp
@@ -1,3 +1,7 @@
+# common things to set up on every node
+# leftover from the past, where we did two puppetruns
+# after another. We should consolidate this into site_config::default
+# in the future.
class site_config::setup {
tag 'leap_base'
@@ -13,9 +17,7 @@ class site_config::setup {
include stdlib
# configure /etc/hosts
- class { 'site_config::hosts':
- stage => setup,
- }
+ class { 'site_config::hosts': }
include site_config::initial_firewall
diff --git a/puppet/modules/site_config/manifests/slow.pp b/puppet/modules/site_config/manifests/slow.pp
index 94bac88d..3650eb19 100644
--- a/puppet/modules/site_config/manifests/slow.pp
+++ b/puppet/modules/site_config/manifests/slow.pp
@@ -1,6 +1,7 @@
+# this class is run by default, but can be excluded
+# for testing purposes by calling "leap deploy" with
+# the "--fast" parameter
class site_config::slow {
tag 'leap_slow'
- class { 'site_apt::dist_upgrade':
- stage => setup,
- }
+ class { 'site_apt::dist_upgrade': }
}