diff options
author | varac <varacanero@zeromail.org> | 2015-12-09 16:43:26 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2015-12-09 17:01:28 +0100 |
commit | b383a34e7ae0f988bf942bd033d8795bd8ea71ac (patch) | |
tree | b08bc3ba2de6603aa54bbca07bc262ffc180a43c /puppet/modules | |
parent | 9cf371a397839723bba06018db003ed8e78e5694 (diff) |
[feat] Remove puppet run stages
To reduce complexity, let's get rid of run stages.
We used them earlier but they seem to have no purpose anymore.
There was two stage leftovers:
- `site_config::slow` did an `apt-get dist-upgrade` in the
`setup` stage
- `site_config::setup` did call the `site_config::hosts` class
in the `setup` stage
I checked for dependencies to to those resources, and it looks good,
i tested by triggering a citest.
From
https://docs.puppetlabs.com/puppet/latest/reference/lang_run_stages.html#limitations-and-known-issues:
```
Due to these limitations, stages should only be used with the simplest
of classes, and only when absolutely necessary. Mass dependencies like
package repositories are effectively the only valid use case.
```
Diffstat (limited to 'puppet/modules')
-rw-r--r-- | puppet/modules/site_config/manifests/setup.pp | 8 | ||||
-rw-r--r-- | puppet/modules/site_config/manifests/slow.pp | 7 |
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': } } |