Andrew Bogott has submitted this change and it was merged.
Change subject: icinga: Move purge resource script into module
......................................................................
icinga: Move purge resource script into module
- Also move pep8 config, since otherwise jenkins
will complain
Change-Id: I4ac1e2e360781cb747aa3b59c83dcf2d3149f2d0
---
M manifests/misc/icinga.pp
R modules/icinga/files/.pep8
R modules/icinga/files/purge-nagios-resources.py
M modules/icinga/manifests/init.pp
4 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 6fd6b72..82c726f 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -44,14 +44,6 @@
mode => '0755',
}
- # Script to purge resources for non-existent hosts
- file { '/usr/local/sbin/purge-nagios-resources.py':
- source => 'puppet:///files/icinga/purge-nagios-resources.py',
- owner => 'root',
- group => 'root',
- mode => '0755',
- }
-
file { '/var/log/icinga':
ensure => directory,
owner => 'icinga',
diff --git a/files/icinga/.pep8 b/modules/icinga/files/.pep8
similarity index 100%
rename from files/icinga/.pep8
rename to modules/icinga/files/.pep8
diff --git a/files/icinga/purge-nagios-resources.py
b/modules/icinga/files/purge-nagios-resources.py
similarity index 100%
rename from files/icinga/purge-nagios-resources.py
rename to modules/icinga/files/purge-nagios-resources.py
diff --git a/modules/icinga/manifests/init.pp b/modules/icinga/manifests/init.pp
index 2b8580c..dad3124 100644
--- a/modules/icinga/manifests/init.pp
+++ b/modules/icinga/manifests/init.pp
@@ -133,6 +133,14 @@
],
}
+ # Script to purge resources for non-existent hosts
+ file { '/usr/local/sbin/purge-nagios-resources.py':
+ source => 'puppet:///modules/icinga/purge-nagios-resources.py',
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
+ }
+
# fix permissions on all individual service files
# FIXME: THis should not be needed *at all*. Should
# just have everything bet written with 'icinga' as
--
To view, visit https://gerrit.wikimedia.org/r/164676
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4ac1e2e360781cb747aa3b59c83dcf2d3149f2d0
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
