Ori.livneh has submitted this change and it was merged.
Change subject: Systemuser -> Generic::Systemuser
......................................................................
Systemuser -> Generic::Systemuser
I3a5ef3a20 changed the user resource from 'Systemuser' to
'Generic::Systemuser', but it only updated resource declarations, not the
requires that referred to them.
Change-Id: Ic076f4a8489d790426e8668a41a325c531ec5031
---
M manifests/gerrit.pp
M manifests/mail.pp
M manifests/misc/gitblit.pp
M manifests/misc/install-server.pp
M manifests/nfs.pp
M manifests/openstack.pp
M modules/applicationserver/manifests/pybal_check.pp
M modules/jenkins/manifests/slave.pp
M modules/mediawiki/manifests/users/l10nupdate.pp
9 files changed, 16 insertions(+), 16 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/gerrit.pp b/manifests/gerrit.pp
index 7238d58..d991e11 100644
--- a/manifests/gerrit.pp
+++ b/manifests/gerrit.pp
@@ -328,7 +328,7 @@
key => $sshkey,
type => "ssh-rsa",
user => $slaveuser,
- require => Systemuser[$slaveuser],
+ require => Generic::Systemuser[$slaveuser],
ensure => present;
}
}
diff --git a/manifests/mail.pp b/manifests/mail.pp
index 10d8102..16b14ea 100644
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -318,7 +318,7 @@
if ( $spamd_user == "spamd" ) {
generic::systemuser { "spamd": name => "spamd" }
file { "/var/spamd":
- require => Systemuser[spamd],
+ require => Generic::Systemuser[spamd],
ensure => directory,
owner => spamd,
group => spamd,
diff --git a/manifests/misc/gitblit.pp b/manifests/misc/gitblit.pp
index 06f4847..1f188b5 100644
--- a/manifests/misc/gitblit.pp
+++ b/manifests/misc/gitblit.pp
@@ -31,19 +31,19 @@
owner => $user,
group => $user,
source => "puppet:///files/gitblit/gitblit.properties",
- require => Systemuser[$user];
+ require => Generic::Systemuser[$user];
"/var/lib/${user}/data/header.md":
mode => 0444,
owner => $user,
group => $user,
source => "puppet:///files/gitblit/header.md",
- require => Systemuser[$user];
+ require => Generic::Systemuser[$user];
"/etc/init.d/gitblit":
mode => 0554,
owner => $user,
group => $user,
source => "puppet:///files/gitblit/gitblit-ubuntu",
- require => Systemuser[$user];
+ require => Generic::Systemuser[$user];
"/var/www/robots.txt":
mode => 0444,
owner => root,
@@ -56,7 +56,7 @@
subscribe =>
File["/var/lib/${user}/data/gitblit.properties"],
enable => true,
ensure => running,
- require => Systemuser[$user];
+ require => Generic::Systemuser[$user];
}
apache_site { git: name => "git.wikimedia.org" }
diff --git a/manifests/misc/install-server.pp b/manifests/misc/install-server.pp
index eea0fe4..f843202 100644
--- a/manifests/misc/install-server.pp
+++ b/manifests/misc/install-server.pp
@@ -153,7 +153,7 @@
# Top level directory must exist
file { '/srv/ubuntu/':
ensure => directory,
- require => Systemuser[mirror],
+ require => Generic::Systemuser[mirror],
mode => '0755',
owner => 'mirror',
group => 'mirror',
@@ -175,7 +175,7 @@
# Mirror update cron entry
cron { 'update-ubuntu-mirror':
ensure => present,
- require => [ Systemuser[mirror], File['update-ubuntu-mirror'] ],
+ require => [ Generic::Systemuser[mirror],
File['update-ubuntu-mirror'] ],
command => '/usr/local/sbin/update-ubuntu-mirror 1>/dev/null
2>/var/lib/mirror/mirror.err.log',
user => mirror,
hour => '*/6',
diff --git a/manifests/nfs.pp b/manifests/nfs.pp
index 28ab971..8a50723 100644
--- a/manifests/nfs.pp
+++ b/manifests/nfs.pp
@@ -168,7 +168,7 @@
file { "/home/wikipedia":
ensure => directory,
- require => Systemuser['wikipediauser']
+ require => Generic::Systemuser['wikipediauser']
}
}
}
diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index 6bac80a..e6ae2e5 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -240,7 +240,7 @@
$sudo_privs = [ 'ALL = NOPASSWD: /bin/mkdir -p /srv/*',
'ALL = NOPASSWD: /bin/rmdir /srv/*',
'ALL = NOPASSWD: /usr/local/sbin/sync-exports' ]
- sudo_user { [ "nfsmanager" ]: privileges => $sudo_privs, require =>
Systemuser["nfsmanager"] }
+ sudo_user { [ "nfsmanager" ]: privileges => $sudo_privs, require =>
Generic::Systemuser["nfsmanager"] }
generic::systemuser { "nfsmanager": name => "nfsmanager", home =>
"/var/lib/nfsmanager", shell => "/bin/bash" }
}
@@ -250,7 +250,7 @@
$sudo_privs = [ 'ALL = NOPASSWD: /bin/mkdir -p /a/*',
'ALL = NOPASSWD: /bin/rmdir /a/*',
'ALL = NOPASSWD: /usr/sbin/gluster *' ]
- sudo_user { [ "glustermanager" ]: privileges => $sudo_privs, require =>
Systemuser["glustermanager"] }
+ sudo_user { [ "glustermanager" ]: privileges => $sudo_privs, require =>
Generic::Systemuser["glustermanager"] }
package { "python-paramiko":
ensure => present;
@@ -263,7 +263,7 @@
user => "glustermanager",
type => "ssh-rsa",
key =>
"AAAAB3NzaC1yc2EAAAABIwAAAQEAuE328+IMmMOoqFhti58rBBxkJy2u+sgxcKuJ4B5248f73YqfZ3RkEWvBGb3ce3VCptrrXJAMCw55HsMyhT8A7chBGLdjhPjol+3Vh2+mc6EkjW0xscX39gh1Fn1jVqrx+GMIuwid7zxGytaKyQ0vko4FP64wDbm1rfVc1jsLMQ+gdAG/KNGYtwjLMEQk8spydckAtkWg3YumMl7e4NQYpYlkTXgVIQiZGpslu5LxKBmXPPF4t2h17p+rNr9ZAVII4av8vRiyQa2/MaH4QZoGYGbkQXifbhBD438NlgZrvLANYuT78zPj4n1G061s7n9nmvVMH3W7QyXS8MpftLnegw==",
- require => Systemuser["glustermanager"];
+ require => Generic::Systemuser["glustermanager"];
}
file {
"/var/lib/glustermanager/.ssh/id_rsa":
@@ -277,7 +277,7 @@
owner => glustermanager,
group => glustermanager,
mode => 0700,
- require => Systemuser["glustermanager"];
+ require => Generic::Systemuser["glustermanager"];
}
}
diff --git a/modules/applicationserver/manifests/pybal_check.pp
b/modules/applicationserver/manifests/pybal_check.pp
index 634ca0f..082416e 100644
--- a/modules/applicationserver/manifests/pybal_check.pp
+++ b/modules/applicationserver/manifests/pybal_check.pp
@@ -7,7 +7,7 @@
file {
"/var/lib/pybal-check/.ssh":
- require => Systemuser["pybal-check"],
+ require => Generic::Systemuser["pybal-check"],
owner => "pybal-check",
group => "pybal-check",
mode => 0550,
diff --git a/modules/jenkins/manifests/slave.pp
b/modules/jenkins/manifests/slave.pp
index e23d2e9..ec0bee4 100644
--- a/modules/jenkins/manifests/slave.pp
+++ b/modules/jenkins/manifests/slave.pp
@@ -21,7 +21,7 @@
owner => $user,
group => $user,
mode => '0775',
- require => Systemuser[$user],
+ require => Generic::Systemuser[$user],
}
# Finally publish the Jenkins master authorized key
diff --git a/modules/mediawiki/manifests/users/l10nupdate.pp
b/modules/mediawiki/manifests/users/l10nupdate.pp
index af0447a..cdb113d 100644
--- a/modules/mediawiki/manifests/users/l10nupdate.pp
+++ b/modules/mediawiki/manifests/users/l10nupdate.pp
@@ -9,7 +9,7 @@
file {
"/home/l10nupdate/.ssh":
- require => Systemuser["l10nupdate"],
+ require => Generic::Systemuser["l10nupdate"],
owner => l10nupdate,
group => l10nupdate,
mode => 0500,
--
To view, visit https://gerrit.wikimedia.org/r/92838
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic076f4a8489d790426e8668a41a325c531ec5031
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
