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