summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-12-04 13:56:41 +0100
committervarac <varacanero@zeromail.org>2014-12-04 13:56:41 +0100
commit049b29370e406cb424254f3be9a283f83f9e92d8 (patch)
tree15ea405178775ca64cfd922dc0f579b0cb889606 /puppet/modules
parent60bd76583d46fe1c9f39804c7fd892fa9c1745d0 (diff)
remove webapp python tests, because they are integrated into the platform now (Bug #6489)
Change-Id: Iaec748a173b6e11bb3ab3c11ca152809817644f9
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_check_mk/manifests/agent/webapp.pp19
1 files changed, 5 insertions, 14 deletions
diff --git a/puppet/modules/site_check_mk/manifests/agent/webapp.pp b/puppet/modules/site_check_mk/manifests/agent/webapp.pp
index 64f5ea6d..88c3da30 100644
--- a/puppet/modules/site_check_mk/manifests/agent/webapp.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/webapp.pp
@@ -1,20 +1,11 @@
class site_check_mk::agent::webapp {
- # check webapp login + soledad sync
- package { [ 'python-srp', 'python-requests', 'python-yaml', 'python-u1db' ]:
- ensure => installed
+ # remove leftovers of webapp python checks
+ file {
+ [ '/usr/lib/check_mk_agent/local/nagios-webapp_login.py',
+ '/usr/lib/check_mk_agent/local/soledad_sync.py' ]:
+ ensure => absent
}
- file { '/usr/lib/check_mk_agent/local/nagios-webapp_login.py':
- ensure => link,
- target => '/srv/leap/webapp/test/nagios/webapp_login.py',
- require => Package['check_mk-agent']
- }
- file { '/usr/lib/check_mk_agent/local/soledad_sync.py':
- ensure => link,
- target => '/srv/leap/webapp/test/nagios/soledad_sync.py',
- require => Package['check_mk-agent']
- }
-
# check syslog
concat::fragment { 'syslog_webapp':