From 7c0a9f293db259293e51eb4c5a51632f04508624 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Fri, 16 Sep 2016 18:05:56 -0400 Subject: [PATCH] Add zuul-launcher keytab to zl0(1-8) nodes This is required to publish doc jobs to AFS with zuul. Change-Id: Icfa8f83906f97e0ca98a240c0514289edacba0fb Signed-off-by: Paul Belanger --- manifests/site.pp | 1 + modules/openstack_project/manifests/zuul_launcher.pp | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/manifests/site.pp b/manifests/site.pp index 6ef3d4faec..5bb974a4ba 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -896,6 +896,7 @@ node /^zl\d+\.openstack\.org$/ { project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', sysadmins => hiera('sysadmins', []), sites => hiera('zuul_sites', []), + zuul_launcher_keytab => hiera('zuul_launcher_keytab'), } } diff --git a/modules/openstack_project/manifests/zuul_launcher.pp b/modules/openstack_project/manifests/zuul_launcher.pp index 8d916b2ef2..0a836d0b3c 100644 --- a/modules/openstack_project/manifests/zuul_launcher.pp +++ b/modules/openstack_project/manifests/zuul_launcher.pp @@ -34,6 +34,7 @@ class openstack_project::zuul_launcher( $sites = [], $nodes = [], $accept_nodes = '', + $zuul_launcher_keytab = '', ) { class { '::project_config': @@ -41,6 +42,13 @@ class openstack_project::zuul_launcher( base => $project_config_base, } + file { '/etc/zuul-launcher.keytab': + owner => 'zuul', + group => 'zuul', + mode => '0400', + content => $zuul_launcher_keytab, + } + file { '/etc/jenkins_jobs': ensure => directory, }