opendev/system-config
Code Issues Proposed changes

Merge "Add zuul-launcher keytab to zl0(1-8) nodes"

Browse Source
This commit is contained in:
Jenkins 2016-09-27 17:38:12 +00:00 committed by Gerrit Code Review
commit 96897ddb3a
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/site.pp
View File

@ -909,6 +909,7 @@ node /^zl\d+\.openstack\.org$/ {
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),
sites => hiera('zuul_sites', []), sites => hiera('zuul_sites', []),
zuul_launcher_keytab => hiera('zuul_launcher_keytab'),
} }
} }

8
modules/openstack_project/manifests/zuul_launcher.pp
View File

@ -34,6 +34,7 @@ class openstack_project::zuul_launcher(
$sites = [], $sites = [],
$nodes = [], $nodes = [],
$accept_nodes = '', $accept_nodes = '',
$zuul_launcher_keytab = '',
) { ) {
class { '::project_config': class { '::project_config':
@ -41,6 +42,13 @@ class openstack_project::zuul_launcher(
base => $project_config_base, base => $project_config_base,
} }
file { '/etc/zuul-launcher.keytab':
owner => 'zuul',
group => 'zuul',
mode => '0400',
content => $zuul_launcher_keytab,
}
file { '/etc/jenkins_jobs': file { '/etc/jenkins_jobs':
ensure => directory, ensure => directory,
} }