Merge "Add creation of secure.conf file"

This commit is contained in:
Jenkins 2015-08-14 02:24:57 +00:00 committed by Gerrit Code Review
commit f2168cd978
3 changed files with 48 additions and 0 deletions

View File

@ -3,3 +3,24 @@
## Overview
Configures Nodepool node.
```puppet
class { '::nodepool':
mysql_root_password => 'xxx',
mysql_password => 'xxx',
nodepool_ssh_private_key => 'optional_key_content',
environment => {
optional_setting_1 => 'optional_value_1',
optional_setting_2 => 'optional_value_2',
},
jenkins_masters => [
{
name => 'jenkins_name'
user => 'jenkins_user',
apikey => 'jenkins_pass',
credentials => 'jenkins_credentials_id',
url => 'jenkins_url',
}
]
}
```

View File

@ -33,6 +33,7 @@ class nodepool (
$scripts_dir = '',
$elements_dir = '',
$logging_conf_template = 'nodepool/nodepool.logging.conf.erb',
$jenkins_masters = [],
) {
@ -237,6 +238,19 @@ class nodepool (
content => template($logging_conf_template),
}
validate_array($jenkins_masters)
file { '/etc/nodepool/secure.conf':
ensure => present,
owner => 'nodepool',
group => 'root',
mode => '0400',
content => template('nodepool/secure.conf.erb'),
require => [
File['/etc/nodepool'],
User['nodepool'],
],
}
file { '/etc/init.d/nodepool':
ensure => present,
mode => '0555',
@ -290,4 +304,5 @@ class nodepool (
group => 'root',
mode => '0440',
}
}

12
templates/secure.conf.erb Normal file
View File

@ -0,0 +1,12 @@
[database]
dburi=mysql+pymysql://nodepool:<%= @mysql_password %>@localhost/nodepool
<% @jenkins_masters.each do |master| -%>
[jenkins "<%= master['name'] -%>"]
user=<%= master['user'] %>
apikey=<%= master['apikey'] %>
<% if master.has_key?('credentials') -%>
credentials=<%= master['credentials'] %>
<% end -%>
url=<%= master['url'] %>
<% end %>