Dzahn has submitted this change and it was merged.
Change subject: convert logstash root users to admin yaml
......................................................................
convert logstash root users to admin yaml
- new group for users with root on logstash boxes
- convert existing users from site.pp
Change-Id: Iffd7f9a47e186f8118d108ccc89833b8bd565f6d
---
M manifests/site.pp
M modules/admin/data/data.yaml
2 files changed, 7 insertions(+), 10 deletions(-)
Approvals:
Rush: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index f638a3c..9bc3957 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2683,18 +2683,11 @@
$ganglia_aggregator = true
}
+ class { 'admin': groups => ['logstash-roots'] }
+
include standard
include role::logstash
include role::kibana
- include groups::wikidev
- include accounts::aaron
- include accounts::bd808
- include accounts::manybubbles
- include accounts::demon
-
- sudo_user { ['aaron', 'bd808', 'manybubbles', 'demon']: # RT 6366, 6896
- privileges => ['ALL = NOPASSWD: ALL'],
- }
}
node 'tin.eqiad.wmnet' {
diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index c88a576..7ca6f63 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -135,7 +135,11 @@
gid: 721
description: admins for pdf render (rt 6468)
members: [mwalker]
-
+ logstash-roots:
+ gid: 722
+ description: users with root access on logstash nodes (rt 6366, 6896)
+ members: [aaron, bd808, manybubbles, demon]
+ privs: ['ALL = NOPASSWD: ALL']
users:
rush:
ensure: present
--
To view, visit https://gerrit.wikimedia.org/r/136163
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iffd7f9a47e186f8118d108ccc89833b8bd565f6d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Manybubbles <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits