opendev/system-config
Code Issues Proposed changes

Make jenkinsuser a class.

Browse Source 
And invoke it correctly on static.o.o.

Change-Id: Ic4699828500f4acf4af60248ba87200c0e703fc6
Reviewed-on: https://review.openstack.org/11496
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
James E. Blair 2012-08-16 19:43:11 +00:00 committed by Jenkins
parent 6b127916bc
commit 3fc347a536
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/jenkins/manifests/jenkinsuser.pp
View File

@ -1,4 +1,4 @@
define jenkins::jenkinsuser($ensure = present, $sudo = false, $ssh_key) {
class jenkins::jenkinsuser($ensure = present, $sudo = false, $ssh_key) {
group { 'jenkins':
ensure => 'present'

2
modules/jenkins/manifests/slave.pp
View File

@ -3,7 +3,7 @@ class jenkins::slave($ssh_key, $sudo = false, $bare = false, $user = true) {
include pip
if ($user == true) {
jenkins::jenkinsuser { "jenkins":
class { 'jenkins::jenkinsuser':
ensure => present,
sudo => $sudo,
ssh_key => "${ssh_key}"

2
modules/openstack_project/manifests/init.pp
View File

@ -1,6 +1,6 @@
class openstack_project {
$jenkins_ssh_key = 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAtioTW2wh3mBRuj+R0Jyb/mLt5sjJ8dEvYyA8zfur1dnqEt5uQNLacW4fHBDFWJoLHfhdfbvray5wWMAcIuGEiAA2WEH23YzgIbyArCSI+z7gB3SET8zgff25ukXlN+1mBSrKWxIza+tB3NU62WbtO6hmelwvSkZ3d7SDfHxrc4zEpmHDuMhxALl8e1idqYzNA+1EhZpbcaf720mX+KD3oszmY2lqD1OkKMquRSD0USXPGlH3HK11MTeCArKRHMgTdIlVeqvYH0v0Wd1w/8mbXgHxfGzMYS1Ej0fzzJ0PC5z5rOqsMqY1X2aC1KlHIFLAeSf4Cx0JNlSpYSrlZ/RoiQ== hudson@hudson'
$jenkins_ssh_key = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAtioTW2wh3mBRuj+R0Jyb/mLt5sjJ8dEvYyA8zfur1dnqEt5uQNLacW4fHBDFWJoLHfhdfbvray5wWMAcIuGEiAA2WEH23YzgIbyArCSI+z7gB3SET8zgff25ukXlN+1mBSrKWxIza+tB3NU62WbtO6hmelwvSkZ3d7SDfHxrc4zEpmHDuMhxALl8e1idqYzNA+1EhZpbcaf720mX+KD3oszmY2lqD1OkKMquRSD0USXPGlH3HK11MTeCArKRHMgTdIlVeqvYH0v0Wd1w/8mbXgHxfGzMYS1Ej0fzzJ0PC5z5rOqsMqY1X2aC1KlHIFLAeSf4Cx0JNlSpYSrlZ/RoiQ== hudson@hudson\n"
$sysadmins = [
'corvus@inaugust.com',

6
modules/openstack_project/manifests/static.pp
View File

@ -1,13 +1,11 @@
class openstack_project::static(
$ssh_key=$openstack_project::jenkins_ssh_key
) {
class openstack_project::static() {
class { 'openstack_project::server':
iptables_public_tcp_ports => [22, 80, 443]
}
class { 'jenkins::jenkinsuser':
ssh_key => $ssh_key
ssh_key => $openstack_project::jenkins_ssh_key
}
include apache