Skip to content
This repository has been archived by the owner on Aug 29, 2018. It is now read-only.

Fix resource_limits.conf #405

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion manifests/node.pp
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,10 @@
}
exec { 'restart resource limiting services':
command => 'oo-cgroup-enable --with-all-containers; oo-pam-enable --with-all-containers; oo-admin-ctl-tc restart',
notify => Service["${::openshift_origin::params::ruby_scl_prefix}mcollective"],
notify => [
Service["${::openshift_origin::params::ruby_scl_prefix}mcollective"],
Service['openshift-watchman'],
],
require => File['openshift node config'],
refreshonly => true,
}
Expand Down
3 changes: 2 additions & 1 deletion templates/node/resource_limits.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
# Limit resources for a new OpenShift guest user on a node
#
# NOTE: If you change these, please run the following commands:
# service mcollective restart
# service ruby193-mcollective restart
# oo-cgroup-enable --with-all-containers
# oo-pam-enable --with-all-containers
# oo-admin-ctl-tc restart
# service openshift-watchman restart
#
#
# Standard Profile
Expand Down