Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/315650
Change subject: contint: stop jenkins on contint1001
......................................................................
contint: stop jenkins on contint1001
We dont want Puppet to bring up Jenkins automagically. Add parameters to
the puppet class that are passed to Service['jenkins']. On contint1001
prevent service from starting on boot and ensure it is stopped.
Change-Id: I265a6ef2c62e51c84fab81e69a6caa1089785491
---
M hieradata/hosts/contint1001.yaml
M modules/jenkins/manifests/init.pp
2 files changed, 21 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/315650/1
diff --git a/hieradata/hosts/contint1001.yaml b/hieradata/hosts/contint1001.yaml
index b3b343b..d977a20 100644
--- a/hieradata/hosts/contint1001.yaml
+++ b/hieradata/hosts/contint1001.yaml
@@ -6,3 +6,6 @@
ssh::server::explicit_macs: false
cluster: misc
contactgroups: 'admins,contint'
+
+jenkinks::service_ensure: stopped
+jenkinks::service_enable: false
diff --git a/modules/jenkins/manifests/init.pp
b/modules/jenkins/manifests/init.pp
index 9669681..adc730e 100644
--- a/modules/jenkins/manifests/init.pp
+++ b/modules/jenkins/manifests/init.pp
@@ -1,4 +1,19 @@
-class jenkins {
+# == Class jenkins
+#
+# Set up a basic Jenkins master instance for CI.
+#
+# == Parameters:
+#
+# [*service_ensure*] [*service_enable*]
+#
+# Passed to Puppet Service['jenkins'] as 'ensure' (default: 'running') and
+# 'enable' (default: true).
+#
+class jenkins(
+ $service_ensure = 'running',
+ $service_enable = true,
+)
+{
require jenkins::user
require jenkins::group
@@ -44,8 +59,8 @@
}
service { 'jenkins':
- ensure => 'running',
- enable => true,
+ ensure => $service_ensure,
+ enable => $service_enable,
hasrestart => true,
# Better have umask properly set before starting
require => File['/var/lib/jenkins/.daemonrc'],
--
To view, visit https://gerrit.wikimedia.org/r/315650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I265a6ef2c62e51c84fab81e69a6caa1089785491
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
