Demon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/60302
Change subject: Deprecate $name param to systemuser in favor of $title
......................................................................
Deprecate $name param to systemuser in favor of $title
Rather than doing this for all usages and risk breaking stuff, allow
callers to still specify $name if they'd like.
Updated the gerrit usages to be a model citizen.
Change-Id: I0f9dd3d6f24b45b566fc379591294c7f90235550
---
M manifests/generic-definitions.pp
M manifests/gerrit.pp
2 files changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/02/60302/1
diff --git a/manifests/generic-definitions.pp b/manifests/generic-definitions.pp
index ae22901..46ca200 100644
--- a/manifests/generic-definitions.pp
+++ b/manifests/generic-definitions.pp
@@ -24,8 +24,8 @@
}
# Creates a system username with associated group, random uid/gid, and
/bin/false as shell
-define systemuser($name, $home=undef, $managehome=true, $shell="/bin/false",
$groups=undef, $default_group=$name, $ensure=present) {
- # FIXME: deprecate $name parameter in favor of just using $title
+define systemuser($name = undef, $home=undef, $managehome=true,
$shell="/bin/false", $groups=undef, $default_group=$name, $ensure=present) {
+ $name = $name ? { undef => $title, default => $name }
if $default_group == $name {
group { $default_group:
diff --git a/manifests/gerrit.pp b/manifests/gerrit.pp
index 0b51e01..3e7839d 100644
--- a/manifests/gerrit.pp
+++ b/manifests/gerrit.pp
@@ -402,7 +402,6 @@
# replication. See role::gerrit::production::replicationdest
class gerrit::replicationdest( $sshkey, $extra_groups = undef, $slaveuser =
"gerritslave" ) {
systemuser { $slaveuser:
- name => $slaveuser,
groups => $extra_groups,
shell => "/bin/bash";
}
--
To view, visit https://gerrit.wikimedia.org/r/60302
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f9dd3d6f24b45b566fc379591294c7f90235550
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Demon <ch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
