Merge "Remove /etc/sudoers.d/jenkins-sudo support"

modules/openstack_project/files/jenkins-sudo.sudo

@@ -1 +0,0 @@
-jenkins ALL=(ALL) NOPASSWD:ALL

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':
+  class { 'openstack_project::slave_common': }
-    sudo                => $sudo,
-  }
-
 }

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':

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',
-  }
 }