slapgrid: Don't check root if we don't want to.

parent 84db69f1
...@@ -7,6 +7,7 @@ from slapos.grid.utils import setRunning, setFinished ...@@ -7,6 +7,7 @@ from slapos.grid.utils import setRunning, setFinished
from slapos.grid.slapgrid import (merged_options, check_missing_parameters, check_missing_files, from slapos.grid.slapgrid import (merged_options, check_missing_parameters, check_missing_files,
random_delay, create_slapgrid_object) random_delay, create_slapgrid_object)
from slapos.util import string_to_boolean
class SlapgridCommand(ConfigCommand): class SlapgridCommand(ConfigCommand):
command_group = 'node' command_group = 'node'
...@@ -62,11 +63,15 @@ class SlapgridCommand(ConfigCommand): ...@@ -62,11 +63,15 @@ class SlapgridCommand(ConfigCommand):
help='Deprecated. Will only work from configuration file in the future.') help='Deprecated. Will only work from configuration file in the future.')
return ap return ap
@must_be_root
def take_action(self, args): def take_action(self, args):
configp = self.fetch_config(args) configp = self.fetch_config(args)
options = merged_options(args, configp) options = merged_options(args, configp)
# Parse if we have to check if running from root
# XXX document this feature.
if string_to_boolean(options.get('root_check', 'True').lower()):
must_be_root(lambda:None)
check_missing_parameters(options) check_missing_parameters(options)
check_missing_files(options) check_missing_files(options)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment