Use the default jenkins password for JJB

This module does not create a jenkins user within jenkins, so there is
no way its password could have been set to 'secret'. Trying to use this
as JJB's auth credentials was causing the JJB exec to fail. This patch
grabs the default admin password out of /var and uses that for JJB.

Change-Id: Ifa60398acbc494dcfecd0cabaa8c829590c1744e
This commit is contained in:
Colleen Murphy 2017-06-11 16:21:00 +02:00
parent c476756cd6
commit e3f67e7941
2 changed files with 7 additions and 3 deletions

View File

@ -4,8 +4,8 @@ class { '::jenkins::slave':
class { '::jenkins::job_builder':
url => "https://${::fqdn}",
username => 'jenkins',
password => 'secret',
username => 'admin',
password => '<<jenkins_default_password>>',
jenkins_jobs_update_timeout => 1200,
config_dir => '/etc/project-config/jenkins',
require => Class['::jenkins::slave'],

View File

@ -11,9 +11,13 @@ describe 'puppet-jenkins slave module', :if => ['debian', 'ubuntu'].include?(os[
File.read(module_path)
end
def default_password
command('/bin/cat /var/lib/jenkins/secrets/initialAdminPassword').stdout.chomp
end
def jenkins_slave_puppet_module
module_path = File.join(pp_path, 'slave.pp')
File.read(module_path)
File.read(module_path).gsub('<<jenkins_default_password>>', default_password)
end
before(:all) do