Filippo Giunchedi has submitted this change and it was merged.
Change subject: puppetize icinga tmpfs mount in prod
......................................................................
puppetize icinga tmpfs mount in prod
follow-up to Ib6fbe3349126
puppetize the tmpfs mount icinga has
in production
@neon:~# grep tmp /etc/fstab
tmpfs /var/icinga-tmpfs tmpfs size=128m,uid=icinga,gid=icinga,mode=755
0 0
Change-Id: Iaef90b5ef8760443133c52dacef8de58ec917d7e
---
M manifests/misc/icinga.pp
1 file changed, 12 insertions(+), 4 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 8365889..3bb10a6 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -748,13 +748,20 @@
require icinga::monitor::apache
- if $::realm == 'labs' {
- #TODO this tempfs mount is not yet puppetized in production
- file { '/var/icinga-tmpfs':
+ file { '/var/icinga-tmpfs':
ensure => directory,
owner => 'icinga',
group => 'icinga',
- }
+ mode => '0755',
+ }
+
+ mount { '/var/icinga-tmpfs':
+ ensure => mounted,
+ atboot => true,
+ fstype => 'tmpfs',
+ device => 'none',
+ options => 'size=128m,uid=icinga,gid=icinga,mode=755',
+ require => File['/var/icinga-tmpfs']
}
service { 'icinga':
@@ -768,6 +775,7 @@
File['/etc/icinga/puppet_hostextinfo.cfg'],
File['/etc/icinga/puppet_hosts.cfg'],
],
+ require => Mount['/var/icinga-tmpfs'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/158555
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaef90b5ef8760443133c52dacef8de58ec917d7e
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: JanZerebecki <jan.wikime...@zerebecki.de>
Gerrit-Reviewer: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
