Dzahn has submitted this change and it was merged.

Change subject: deployment,replace generic::systemuser with user
......................................................................


deployment,replace generic::systemuser with user

We want to get rid of generic::systemuser
and replace it with the regular puppet user type
again to remove a layer of abstraction that isn't
really needed.

Change-Id: I2f85b8e16bc5a699ef777d159db44b268fde0dcf
---
M modules/deployment/manifests/deployment_server.pp
1 file changed, 13 insertions(+), 4 deletions(-)

Approvals:
  Rush: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/deployment/manifests/deployment_server.pp 
b/modules/deployment/manifests/deployment_server.pp
index 805d95c..409aed9 100644
--- a/modules/deployment/manifests/deployment_server.pp
+++ b/modules/deployment/manifests/deployment_server.pp
@@ -37,11 +37,20 @@
     }
 
     if $::realm != 'labs' {
-      generic::systemuser { 'trebuchet':
+
+      group { 'trebuchet':
+          ensure => present,
           name   => 'trebuchet',
-          shell  => '/bin/false',
-          home   => '/nonexistent',
-          groups => $deployer_groups,
+          system => true,
+      }
+
+      user { 'trebuchet':
+          shell      => '/bin/false',
+          home       => '/nonexistent',
+          managehome => true,
+          gid        => 'trebuchet',
+          groups     => $deployer_groups,
+          system     => true,
       }
     }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/137993
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2f85b8e16bc5a699ef777d159db44b268fde0dcf
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Ori.livneh <[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

Reply via email to