From 13d54fdc05a7dd0cab3d8021e8b5d0931f809080 Mon Sep 17 00:00:00 2001 From: Michael Krotscheck Date: Thu, 28 Jan 2016 05:33:36 -0800 Subject: [PATCH] Add AFS and Admin keytab to release slave. This patch adds AFS, and the admin keytab, to our release slave, so that we may execute `vos release` when a mirror update is requested. Change-Id: I9c8531304fb74b9bafca85d58b5e9c1c0bc21f6a --- manifests/site.pp | 1 + modules/openstack_project/manifests/release_slave.pp | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/manifests/site.pp b/manifests/site.pp index 39b9e1cc01..14a29addff 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -895,6 +895,7 @@ node 'release.slave.openstack.org' { npm_username => 'openstackci', npm_userpassword => hiera('npm_user_password'), npm_userurl => 'https://openstack.org', + admin_keytab => hiera('afsadmin_keytab'), } } diff --git a/modules/openstack_project/manifests/release_slave.pp b/modules/openstack_project/manifests/release_slave.pp index b727a44fbd..2eda3db24d 100644 --- a/modules/openstack_project/manifests/release_slave.pp +++ b/modules/openstack_project/manifests/release_slave.pp @@ -31,12 +31,21 @@ class openstack_project::release_slave ( $npm_username, $npm_userpassword, $npm_userurl, + $admin_keytab = '', ) { class { 'openstack_project::slave': ssh_key => $jenkins_ssh_public_key, jenkins_gitfullname => $jenkins_gitfullname, jenkins_gitemail => $jenkins_gitemail, project_config_repo => $project_config_repo, + afs => true, + } + + file { '/etc/afsadmin.keytab': + owner => 'root', + group => 'root', + mode => '0400', + content => $admin_keytab, } package { 'twine':