Bug 1112378 - Respect OPENSHIFT_CGROUP_SUBSYSTEMS in oo-accept-node

openshift · Jun 23, 2014 · 9017a2a · 9017a2a
1 parent 71d3807
commit 9017a2a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/node-util/sbin/oo-accept-node b/node-util/sbin/oo-accept-node
@@ -576,7 +576,7 @@ end
 # Verify that the user has a cgroup in all subsystems and no others
 def check_user_cgroups(username)
   user_cgroup="/openshift/#{username}"
-  test_subsystems = Set.new(['cpu', 'cpuacct', 'memory', 'freezer', 'net_cls'])
+  test_subsystems = Set.new($CONF.get('OPENSHIFT_CGROUP_SUBSYSTEMS', 'cpu,cpuacct,memory,freezer,net_cls').split(','))
   if not test_subsystems == $CGROUP_DATA[username]
     user_fail(username, "user #{username} must have all cgroup subsystems.")
   end