From adc50a2f6e3c0e5d1eb0039a8cfec0305343e879 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 26 Apr 2017 14:02:03 -0400 Subject: [PATCH] Remove puppet-jenkins from single_use_slave.pp We now create our jenkins user with DIB elements. Change-Id: I7e5589dad03ce959cdf271cc46e8242c68cb6f2e Depends-On: I33a67f980289002618a55f4221dcf195dc4a787f Signed-off-by: Paul Belanger --- modules/openstack_project/manifests/single_use_slave.pp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/modules/openstack_project/manifests/single_use_slave.pp b/modules/openstack_project/manifests/single_use_slave.pp index 56c7f6f8a1..f3ff331a2b 100644 --- a/modules/openstack_project/manifests/single_use_slave.pp +++ b/modules/openstack_project/manifests/single_use_slave.pp @@ -7,6 +7,7 @@ class openstack_project::single_use_slave ( $certname = $::fqdn, $install_resolv_conf = true, $sudo = false, + # TODO(pabelanger): To be removed in a future patch. $ssh_key = $openstack_project::jenkins_ssh_key, $jenkins_gitfullname = 'OpenStack Jenkins', $jenkins_gitemail = 'jenkins@openstack.org', @@ -15,10 +16,4 @@ class openstack_project::single_use_slave ( certname => $certname, install_resolv_conf => $install_resolv_conf, } - - class { '::jenkins::jenkinsuser': - ssh_key => $ssh_key, - gitfullname => $jenkins_gitfullname, - gitemail => $jenkins_gitemail, - } }