Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/60363
Change subject: remove group.pp from jenkins module to fix duplicate
definition. conflicts with systemuser in generic-definitions.
......................................................................
remove group.pp from jenkins module to fix duplicate definition.
conflicts with systemuser in generic-definitions.
Group[jenkins] is already defined in file
/var/lib/git/operations/puppet/modules/jenkins/manifests/group.pp at line 7;
cannot redefine at
/var/lib/git/operations/puppet/manifests/generic-definitions.pp:34
on node gallium.wikimedia.org
Change-Id: I56df5d09581152672e2cf23b96e037b7ab01b7b0
---
D modules/jenkins/manifests/group.pp
M modules/jenkins/manifests/init.pp
2 files changed, 0 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/63/60363/1
diff --git a/modules/jenkins/manifests/group.pp
b/modules/jenkins/manifests/group.pp
deleted file mode 100644
index 0cd150d..0000000
--- a/modules/jenkins/manifests/group.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-class jenkins::group {
- group { 'jenkins':
- ensure => present,
- name => 'jenkins',
- system => true,
- allowdupe => false,
- }
-}
diff --git a/modules/jenkins/manifests/init.pp
b/modules/jenkins/manifests/init.pp
index b1a851a..c703485 100644
--- a/modules/jenkins/manifests/init.pp
+++ b/modules/jenkins/manifests/init.pp
@@ -1,6 +1,5 @@
class jenkins {
require jenkins::user
- require jenkins::group
# Upgrades are usually done manually by upload the Jenkins
# package at apt.wikimedia.org then restarting jenkins and
--
To view, visit https://gerrit.wikimedia.org/r/60363
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I56df5d09581152672e2cf23b96e037b7ab01b7b0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
