diff options
| author | Micah <micah@riseup.net> | 2015-10-13 14:05:48 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2015-10-13 14:05:48 +0000 |
| commit | 6f04006dc44d52a36fff4d61275c41a6f1f9d59a (patch) | |
| tree | c721eab63eef1467f5977cb94898d05bf50b9496 /puppet/modules/site_nagios | |
| parent | d6b521372243b79105a1513d4559572dfab6db54 (diff) | |
| parent | 19e5d23e3fe34199265117e033acfabc3cff9109 (diff) | |
Merge branch '7514_remove_tapicero_couchdb_user' into 'develop'
7514 remove tapicero couchdb user
- Resolves: #7514
this depends on this couchdb m.r.: https://gitlab.com/leap/couchdb/merge_requests/2
See merge request !78
Diffstat (limited to 'puppet/modules/site_nagios')
| -rw-r--r-- | puppet/modules/site_nagios/manifests/init.pp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/puppet/modules/site_nagios/manifests/init.pp b/puppet/modules/site_nagios/manifests/init.pp index eb08cdcb..40ae4b86 100644 --- a/puppet/modules/site_nagios/manifests/init.pp +++ b/puppet/modules/site_nagios/manifests/init.pp @@ -1,6 +1,10 @@ +# setup nagios on monitoring node class site_nagios { tag 'leap_service' Class['site_config::default'] -> Class['site_nagios'] include site_nagios::server + + # remove leftovers on monitoring nodes + include site_config::remove::monitoring } |