Fixed jenkins user - also removed deprecations.
This commit is contained in:
parent
b41acf292f
commit
75bab37ed6
|
@ -1,6 +1,8 @@
|
||||||
class jenkins_slave {
|
class jenkins_slave {
|
||||||
|
|
||||||
jenkins_user { "jenkins" }
|
jenkinsuser { "jenkins":
|
||||||
|
ensure => present
|
||||||
|
}
|
||||||
|
|
||||||
slavecirepo { "openstack-ci":
|
slavecirepo { "openstack-ci":
|
||||||
ensure => present,
|
ensure => present,
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
class jenkinsuser {
|
define jenkinsuser($ensure = present) {
|
||||||
|
|
||||||
group { 'jenkins':
|
group { 'jenkins':
|
||||||
ensure => 'present'
|
ensure => 'present'
|
||||||
|
@ -7,11 +7,7 @@ class jenkinsuser {
|
||||||
user { 'jenkins':
|
user { 'jenkins':
|
||||||
ensure => 'present',
|
ensure => 'present',
|
||||||
comment => 'Jenkins User',
|
comment => 'Jenkins User',
|
||||||
home => $operatingsystem ? {
|
home => '/home/jenkins',
|
||||||
Darwin => '/Users/jenkins',
|
|
||||||
solaris => '/export/home/jenkins',
|
|
||||||
default => '/home/jenkins',
|
|
||||||
},
|
|
||||||
gid => 'jenkins',
|
gid => 'jenkins',
|
||||||
shell => '/bin/bash',
|
shell => '/bin/bash',
|
||||||
groups => ['wheel','sudo'],
|
groups => ['wheel','sudo'],
|
||||||
|
@ -19,11 +15,7 @@ class jenkinsuser {
|
||||||
}
|
}
|
||||||
|
|
||||||
file { 'jenkinshome':
|
file { 'jenkinshome':
|
||||||
name => $operatingsystem ? {
|
name => '/home/jenkins',
|
||||||
Darwin => '/Users/jenkins',
|
|
||||||
solaris => '/export/home/jenkins',
|
|
||||||
default => '/home/jenkins',
|
|
||||||
},
|
|
||||||
owner => 'jenkins',
|
owner => 'jenkins',
|
||||||
group => 'jenkins',
|
group => 'jenkins',
|
||||||
mode => 644,
|
mode => 644,
|
||||||
|
@ -32,11 +24,7 @@ class jenkinsuser {
|
||||||
|
|
||||||
|
|
||||||
file { 'jenkinssshdir':
|
file { 'jenkinssshdir':
|
||||||
name => $operatingsystem ? {
|
name => '/home/jenkins/.ssh',
|
||||||
Darwin => '/Users/jenkins/.ssh',
|
|
||||||
solaris => '/export/home/jenkins/.ssh',
|
|
||||||
default => '/home/jenkins/.ssh',
|
|
||||||
},
|
|
||||||
owner => 'jenkins',
|
owner => 'jenkins',
|
||||||
group => 'jenkins',
|
group => 'jenkins',
|
||||||
mode => 600,
|
mode => 600,
|
||||||
|
@ -45,11 +33,7 @@ class jenkinsuser {
|
||||||
}
|
}
|
||||||
|
|
||||||
file { 'jenkinskeys':
|
file { 'jenkinskeys':
|
||||||
name => $operatingsystem ? {
|
name => '/home/jenkins/.ssh/authorized_keys',
|
||||||
Darwin => '/Users/jenkins/.ssh/authorized_keys',
|
|
||||||
solaris => '/export/home/jenkins/.ssh/authorized_keys',
|
|
||||||
default => '/home/jenkins/.ssh/authorized_keys',
|
|
||||||
},
|
|
||||||
owner => 'jenkins',
|
owner => 'jenkins',
|
||||||
group => 'jenkins',
|
group => 'jenkins',
|
||||||
mode => 640,
|
mode => 640,
|
||||||
|
@ -59,11 +43,7 @@ class jenkinsuser {
|
||||||
}
|
}
|
||||||
|
|
||||||
file { 'jenkinsbashrc':
|
file { 'jenkinsbashrc':
|
||||||
name => $operatingsystem ? {
|
name => '/home/jenkins/.bashrc',
|
||||||
Darwin => '/Users/jenkins/.bashrc',
|
|
||||||
solaris => '/export/home/jenkins/.bashrc',
|
|
||||||
default => '/home/jenkins/.bashrc',
|
|
||||||
},
|
|
||||||
owner => 'jenkins',
|
owner => 'jenkins',
|
||||||
group => 'jenkins',
|
group => 'jenkins',
|
||||||
mode => 640,
|
mode => 640,
|
||||||
|
@ -73,11 +53,7 @@ class jenkinsuser {
|
||||||
}
|
}
|
||||||
|
|
||||||
file { 'jenkinsbash_logout':
|
file { 'jenkinsbash_logout':
|
||||||
name => $operatingsystem ? {
|
name => '/home/jenkins/.bash_logout',
|
||||||
Darwin => '/Users/jenkins/.bash_logout',
|
|
||||||
solaris => '/export/home/jenkins/.bash_logout',
|
|
||||||
default => '/home/jenkins/.bash_logout',
|
|
||||||
},
|
|
||||||
source => "/etc/skel/.bash_logout",
|
source => "/etc/skel/.bash_logout",
|
||||||
owner => 'jenkins',
|
owner => 'jenkins',
|
||||||
group => 'jenkins',
|
group => 'jenkins',
|
||||||
|
@ -87,11 +63,7 @@ class jenkinsuser {
|
||||||
}
|
}
|
||||||
|
|
||||||
file { 'jenkinsprofile':
|
file { 'jenkinsprofile':
|
||||||
name => $operatingsystem ? {
|
name => '/home/jenkins/.profile',
|
||||||
Darwin => '/Users/jenkins/.profile',
|
|
||||||
solaris => '/export/home/jenkins/.profile',
|
|
||||||
default => '/home/jenkins/.profile',
|
|
||||||
},
|
|
||||||
source => "/etc/skel/.profile",
|
source => "/etc/skel/.profile",
|
||||||
owner => 'jenkins',
|
owner => 'jenkins',
|
||||||
group => 'jenkins',
|
group => 'jenkins',
|
||||||
|
@ -101,11 +73,7 @@ class jenkinsuser {
|
||||||
}
|
}
|
||||||
|
|
||||||
file { 'jenkinsbazaardir':
|
file { 'jenkinsbazaardir':
|
||||||
name => $operatingsystem ? {
|
name => '/home/jenkins/.bazaar',
|
||||||
Darwin => '/Users/jenkins/.bazaar',
|
|
||||||
solaris => '/export/home/jenkins/.bazaar',
|
|
||||||
default => '/home/jenkins/.bazaar',
|
|
||||||
},
|
|
||||||
owner => 'jenkins',
|
owner => 'jenkins',
|
||||||
group => 'jenkins',
|
group => 'jenkins',
|
||||||
mode => 755,
|
mode => 755,
|
||||||
|
@ -115,11 +83,7 @@ class jenkinsuser {
|
||||||
|
|
||||||
|
|
||||||
file { 'jenkinsbazaarwhoami':
|
file { 'jenkinsbazaarwhoami':
|
||||||
name => $operatingsystem ? {
|
name => '/home/jenkins/.bazaar/bazaar.conf',
|
||||||
Darwin => '/Users/jenkins/.bazaar/bazaar.conf',
|
|
||||||
solaris => '/export/home/jenkins/.bazaar/bazaar.conf',
|
|
||||||
default => '/home/jenkins/.bazaar/bazaar.conf',
|
|
||||||
},
|
|
||||||
owner => 'jenkins',
|
owner => 'jenkins',
|
||||||
group => 'jenkins',
|
group => 'jenkins',
|
||||||
mode => 640,
|
mode => 640,
|
||||||
|
|
Loading…
Reference in New Issue