Faidon Liambotis has submitted this change and it was merged.
Change subject: sudo: fold sudo::labs_project into the role class
......................................................................
sudo: fold sudo::labs_project into the role class
Now that sudo::labs_project doesn't include the sudoers config file, it
practically only consists of a single sudo::group definition. Fold this
into the role::labs::instance and kill the class.
Change-Id: I01b76d039210569bb4976d57ce1cfe9a5c7d2c7d
---
M manifests/role/labs.pp
D modules/sudo/manifests/labs_project.pp
2 files changed, 5 insertions(+), 15 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, but someone else must approve
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index b0e1442..55cb0a5 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -2,7 +2,11 @@
include standard
include base::instance-upstarts
- include sudo::labs_project
+ include sudo
+
+ sudo::group { 'ops':
+ privileges => ['ALL=(ALL) NOPASSWD: ALL'],
+ }
class { 'ldap::role::client::labs':
# Puppet requires ldap, so we need to update ldap before anything
diff --git a/modules/sudo/manifests/labs_project.pp
b/modules/sudo/manifests/labs_project.pp
deleted file mode 100644
index 27a47fa..0000000
--- a/modules/sudo/manifests/labs_project.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-class sudo::labs_project {
- require sudo
-
- if $::realm != 'labs' {
- fail('This class is labs-specific')
- }
-
- # Was handled via sudo ldap, now handled via puppet
- sudo::group { 'ops': privileges => ['ALL=(ALL) NOPASSWD: ALL'] }
- # Old way of handling this.
- sudo::group { $instanceproject: ensure => absent }
- # Another old way, before per-project sudo
- sudo::group { $projectgroup: ensure => absent }
-}
--
To view, visit https://gerrit.wikimedia.org/r/180504
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I01b76d039210569bb4976d57ce1cfe9a5c7d2c7d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: coren <mpellet...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
