From 320dd74280249b09c20230acee6c0c92dbb1d15e Mon Sep 17 00:00:00 2001 From: Michael Krotscheck Date: Wed, 27 Jan 2016 11:31:36 -0800 Subject: [PATCH] Added AFS keytab to wheel slave This adds a hiera-loaded keytab for the wheel slaves. It may be used when writing wheels to the AFS share directory. Note: This will require the creation of a keytab for the wheel mirror, as well as appropriate folders and access rights on AFS. Change-Id: I81c39d420d8ac70def57949ea0d4c323b8797086 --- manifests/site.pp | 2 ++ .../openstack_project/manifests/wheel_mirror_slave.pp | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/manifests/site.pp b/manifests/site.pp index f4fdad9b33..39b9e1cc01 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1136,9 +1136,11 @@ node 'codesearch.openstack.org' { node /.*wheel-mirror-.*\.openstack\.org/ { $group = 'wheel-mirror' include openstack_project + class { 'openstack_project::wheel_mirror_slave': sysadmins => hiera('sysadmins', []), jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key, + wheel_keytab => hiera("wheel_keytab"), } } diff --git a/modules/openstack_project/manifests/wheel_mirror_slave.pp b/modules/openstack_project/manifests/wheel_mirror_slave.pp index 8c1e59c5ac..252bb387d1 100644 --- a/modules/openstack_project/manifests/wheel_mirror_slave.pp +++ b/modules/openstack_project/manifests/wheel_mirror_slave.pp @@ -21,7 +21,18 @@ class openstack_project::wheel_mirror_slave ( $sysadmins = [], $jenkins_gitfullname = 'OpenStack Jenkins', $jenkins_gitemail = 'jenkins@openstack.org', + $wheel_keytab = undef, ) { + + if( $wheel_keytab ) { + file { "/etc/wheel.keytab": + owner => 'root', + group => 'root', + mode => '0400', + content => $wheel_keytab, + } + } + class { 'openstack_project::slave': sysadmins => $sysadmins, ssh_key => $jenkins_ssh_public_key,