From 4d1564635ab6ac40e6c50e01dc34e05b8ec1da91 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Wed, 12 Apr 2017 14:32:54 -0400
Subject: [PATCH] Remove /etc/sudoers.d/jenkins-sudo support

We can move /etc/sudoers.d/jenkins-sudo into a DIB element, and
properly clean up slave_common.pp of our other sudoers.d settings.

Change-Id: I548b22f68b4f288fe1c4658abf9b42a47dc7fa68
Depends-On: Icaceeefbf6c3765d15d0e1488006f9f52661fba3
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 .../openstack_project/files/jenkins-sudo.sudo  |  1 -
 .../manifests/single_use_slave.pp              |  5 +----
 modules/openstack_project/manifests/slave.pp   |  8 ++++++++
 .../manifests/slave_common.pp                  | 18 ------------------
 4 files changed, 9 insertions(+), 23 deletions(-)
 delete mode 100644 modules/openstack_project/files/jenkins-sudo.sudo

diff --git a/modules/openstack_project/files/jenkins-sudo.sudo b/modules/openstack_project/files/jenkins-sudo.sudo
deleted file mode 100644
index 48ddd4301e..0000000000
--- a/modules/openstack_project/files/jenkins-sudo.sudo
+++ /dev/null
@@ -1 +0,0 @@
-jenkins ALL=(ALL) NOPASSWD:ALL
diff --git a/modules/openstack_project/manifests/single_use_slave.pp b/modules/openstack_project/manifests/single_use_slave.pp
index d728cbba72..23420263a9 100644
--- a/modules/openstack_project/manifests/single_use_slave.pp
+++ b/modules/openstack_project/manifests/single_use_slave.pp
@@ -41,8 +41,5 @@ class openstack_project::single_use_slave (
     gitemail    => $jenkins_gitemail,
   }
 
-  class { 'openstack_project::slave_common':
-    sudo                => $sudo,
-  }
-
+  class { 'openstack_project::slave_common': }
 }
diff --git a/modules/openstack_project/manifests/slave.pp b/modules/openstack_project/manifests/slave.pp
index c122072b0a..ad1e5b9d3a 100644
--- a/modules/openstack_project/manifests/slave.pp
+++ b/modules/openstack_project/manifests/slave.pp
@@ -34,6 +34,14 @@ class openstack_project::slave (
     gerritkey    => $jenkins_gerritkey,
   }
 
+  file { '/etc/sudoers.d/jenkins-sudo-grep':
+    ensure => present,
+    source => 'puppet:///modules/openstack_project/jenkins-sudo-grep.sudo',
+    owner  => 'root',
+    group  => 'root',
+    mode   => '0440',
+  }
+
   include jenkins::cgroups
   include ulimit
   ulimit::conf { 'limit_jenkins_procs':
diff --git a/modules/openstack_project/manifests/slave_common.pp b/modules/openstack_project/manifests/slave_common.pp
index 8940b6e2f5..f274329d0f 100644
--- a/modules/openstack_project/manifests/slave_common.pp
+++ b/modules/openstack_project/manifests/slave_common.pp
@@ -3,23 +3,5 @@
 # Common configuration between openstack_project::slave and
 # openstack_project::single_use_slave
 class openstack_project::slave_common(
-  $sudo         = false,
 ){
-  if ($sudo == true) {
-    file { '/etc/sudoers.d/jenkins-sudo':
-      ensure => present,
-      source => 'puppet:///modules/openstack_project/jenkins-sudo.sudo',
-      owner  => 'root',
-      group  => 'root',
-      mode   => '0440',
-    }
-  }
-
-  file { '/etc/sudoers.d/jenkins-sudo-grep':
-    ensure => present,
-    source => 'puppet:///modules/openstack_project/jenkins-sudo-grep.sudo',
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0440',
-  }
 }