Faidon has submitted this change and it was merged.
Change subject: tweak jenkins slave definition
......................................................................
tweak jenkins slave definition
* The ssh_authorized_keys options values must be quoted
* align arrows in manifests/role/jenkins.pp
* Fixed the ssh restriction to use gallium IP address instead of its
broadcast address.
* jenkins-slave user should not belong to the jenkins group.
Change-Id: I6a7603e094fd386aefaad04df34619cca6c39ac1
---
M manifests/role/jenkins.pp
M modules/jenkins/manifests/slave.pp
2 files changed, 12 insertions(+), 14 deletions(-)
Approvals:
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/jenkins.pp b/manifests/role/jenkins.pp
index b5d8ee6..e1609fe 100644
--- a/manifests/role/jenkins.pp
+++ b/manifests/role/jenkins.pp
@@ -4,18 +4,18 @@
system_role { 'role::jenkins::master::production': description =>
'Jenkins master on production' }
file { '/srv/ssd/jenkins':
- ensure => 'directory',
- owner => 'jenkins',
- group => 'jenkins',
- mode => '2775', # group sticky bit
+ ensure => 'directory',
+ owner => 'jenkins',
+ group => 'jenkins',
+ mode => '2775', # group sticky bit
require => Mount['/srv/ssd'],
}
file { '/srv/ssd/jenkins/workspace':
- ensure => 'directory',
- owner => 'jenkins',
- group => 'jenkins',
- mode => '0775',
+ ensure => 'directory',
+ owner => 'jenkins',
+ group => 'jenkins',
+ mode => '0775',
require => [
File['/srv/ssd/jenkins'],
],
@@ -31,10 +31,10 @@
ssh_authorized_key =>
'AAAAB3NzaC1yc2EAAAABIwAAAQEA4QGc1Zs/S4s7znEYw7RifTuZ4y4iYvXl5jp5tJA9kGUGzzfL0dc4ZEEhpu+4C/TixZJXqv0N6yke67cM8hfdXnLOVJc4n/Z02uYHQpRDeLAJUAlGlbGZNvzsOLw39dGF0u3YmwDm6rj85RSvGqz8ExbvrneCVJSaYlIRvOEKw0e0FYs8Yc7aqFRV60M6fGzWVaC3lQjSnEFMNGdSiLp3Vl/GB4GgvRJpbNENRrTS3Te9BPtPAGhJVPliTflVYvULCjYVtPEbvabkW+vZznlcVHAZJVTTgmqpDZEHqp4bzyO8rBNhMc7BjUVyNVNC5FCk+D2LagmIriYxjirXDNrWlw==',
ssh_key_name => 'jenkins@gallium',
# Lamely restrict to master which is gallium
- ssh_key_options => [ 'from=208.80.154.191' ],
- user => 'jenkins-slave',
- home => '/srv/ssd/jenkins-slave',
- require => Mount['/srv/ssd'],
+ ssh_key_options => [ 'from="208.80.154.135"' ],
+ user => 'jenkins-slave',
+ home => '/srv/ssd/jenkins-slave',
+ require => Mount['/srv/ssd'],
}
}
diff --git a/modules/jenkins/manifests/slave.pp
b/modules/jenkins/manifests/slave.pp
index f4f9eca..5e1478d 100644
--- a/modules/jenkins/manifests/slave.pp
+++ b/modules/jenkins/manifests/slave.pp
@@ -21,9 +21,7 @@
user { $user:
ensure => present,
- require => Group['jenkins'],
name => $user,
- gid => 'jenkins',
home => $home,
managehome => false,
shell => '/bin/bash',
--
To view, visit https://gerrit.wikimedia.org/r/64272
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6a7603e094fd386aefaad04df34619cca6c39ac1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Faidon <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
