Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/377213 )
Change subject: CP-JobQueue: Add the service to SCB
......................................................................
CP-JobQueue: Add the service to SCB
Bug: T175281
Change-Id: I1ebdb7eb4964e0ecb57c050ce46876bb8e72a1c7
---
M hieradata/role/common/scb.yaml
M modules/admin/data/data.yaml
M modules/role/manifests/scb.pp
3 files changed, 14 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/13/377213/1
diff --git a/hieradata/role/common/scb.yaml b/hieradata/role/common/scb.yaml
index f2e4eec..aa8f069 100644
--- a/hieradata/role/common/scb.yaml
+++ b/hieradata/role/common/scb.yaml
@@ -3,6 +3,7 @@
- sc-admins
- citoid-admin
- citoid-users
+ - cpjobqueue-admin
- cxserver-admin
- apertium-admins
- graphoid-admin
diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index c368c39..86fe9b8 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -526,6 +526,7 @@
privileges: ['ALL = NOPASSWD: /usr/bin/puppet agent *',
'ALL = NOPASSWD: /usr/sbin/service changeprop *',
'ALL = NOPASSWD: /usr/sbin/service citoid *',
+ 'ALL = NOPASSWD: /usr/sbin/service cpjobqueue *',
'ALL = NOPASSWD: /usr/sbin/service cxserver *',
'ALL = NOPASSWD: /usr/sbin/service graphoid *',
'ALL = NOPASSWD: /usr/sbin/service mathoid *',
@@ -617,6 +618,12 @@
members: [gwicke, ppchelko, eevans, mobrovac, nschaaf]
privileges: ['ALL = NOPASSWD: /usr/sbin/service recommendation_api *',
'ALL = (recommendation_api) NOPASSWD: ALL']
+ cpjobqueue-admin:
+ description: Group of cpjobqueue admins
+ gid: 795
+ members: [mobrovac, gwicke, ppchelko, eevans]
+ privileges: ['ALL = NOPASSWD: /usr/sbin/service cpjobqueue *',
+ 'ALL = (cpjobqueue) NOPASSWD: ALL']
users:
rush:
diff --git a/modules/role/manifests/scb.pp b/modules/role/manifests/scb.pp
index 1ae90c0..39c44af 100644
--- a/modules/role/manifests/scb.pp
+++ b/modules/role/manifests/scb.pp
@@ -5,6 +5,11 @@
include ::profile::ores::web
include ::profile::nutcracker
+ include ::profile::cpjobqueue
+ system::role { 'cpjobqueue':
+ description => 'ChangeProp instance for the JobQueue',
+ }
+
include ::profile::recommendation_api
include role::mobileapps
@@ -24,4 +29,5 @@
if hiera('has_lvs', true) {
include role::lvs::realserver
}
+
}
--
To view, visit https://gerrit.wikimedia.org/r/377213
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ebdb7eb4964e0ecb57c050ce46876bb8e72a1c7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
