Remove 'Temporary for debugging glance' on jenkins slaves
In an effort to clean up our manifests, and add support for Ubuntu Xenial, we can remove this 'temporary' workaround now. If projects need to enable this, doing so in JJB makes more sense today. Change-Id: Iebc359de33748668d1c2cb4c953b60be2dacd7dc Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
c9f8a7a956
commit
4fe99be987
@ -70,26 +70,6 @@ class openstack_project::slave_common(
|
|||||||
mode => '0440',
|
mode => '0440',
|
||||||
}
|
}
|
||||||
|
|
||||||
# Temporary for debugging glance launch problem
|
|
||||||
# https://lists.launchpad.net/openstack/msg13381.html
|
|
||||||
# NOTE(dprince): ubuntu only as RHEL6 doesn't have sysctl.d yet
|
|
||||||
if ($::osfamily == 'Debian') {
|
|
||||||
|
|
||||||
file { '/etc/sysctl.d/10-ptrace.conf':
|
|
||||||
ensure => present,
|
|
||||||
source => 'puppet:///modules/jenkins/10-ptrace.conf',
|
|
||||||
owner => 'root',
|
|
||||||
group => 'root',
|
|
||||||
mode => '0444',
|
|
||||||
}
|
|
||||||
|
|
||||||
exec { 'ptrace sysctl':
|
|
||||||
subscribe => File['/etc/sysctl.d/10-ptrace.conf'],
|
|
||||||
refreshonly => true,
|
|
||||||
command => '/sbin/sysctl -p /etc/sysctl.d/10-ptrace.conf',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# needed by jenkins/jobs
|
# needed by jenkins/jobs
|
||||||
if ! defined(Package['curl']) {
|
if ! defined(Package['curl']) {
|
||||||
package { 'curl':
|
package { 'curl':
|
||||||
|
Loading…
Reference in New Issue
Block a user