Mark Bergsma has submitted this change and it was merged.
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, 6 insertions(+), 7 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/generic-definitions.pp b/manifests/generic-definitions.pp
index 702ba99..7ea5fbd 100644
--- a/manifests/generic-definitions.pp
+++ b/manifests/generic-definitions.pp
@@ -24,22 +24,22 @@
}
# 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) {
+ $username = $name ? { undef => $title, default => $name }
- if $default_group == $name {
+ if $default_group == $username {
group { $default_group:
name => $default_group,
ensure => present;
}
}
- user { $name:
+ user { $username:
require => Group[$default_group],
- name => $name,
+ name => $username,
gid => $default_group,
home => $home ? {
- undef => "/var/lib/${name}",
+ undef => "/var/lib/${username}",
default => $home
},
managehome => $managehome,
diff --git a/manifests/gerrit.pp b/manifests/gerrit.pp
index 808d344..2fb5126 100644
--- a/manifests/gerrit.pp
+++ b/manifests/gerrit.pp
@@ -404,7 +404,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: merged
Gerrit-Change-Id: I0f9dd3d6f24b45b566fc379591294c7f90235550
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Demon
Gerrit-Reviewer: Demon
Gerrit-Reviewer: Mark Bergsma
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
