Merge pull request #30179 from terminalmage/bp-26962

Backport #26962 to 2015.8 branch
This commit is contained in:
Colton Myers 2016-01-06 12:48:30 -07:00
commit 6516d5b5d0

View file

@ -1081,6 +1081,13 @@ class OutputOptionsMixIn(six.with_metaclass(MixInMeta, object)):
'output. One of full, terse, mixed, changes or filter. '
'Default: full.')
)
group.add_option(
'--state-verbose', '--state_verbose',
default=True,
help=('Override the configured state_verbose value for minion '
'output. Set to True or False'
'Default: True')
)
for option in self.output_options_group.option_list:
def process(opt):
@ -1112,6 +1119,12 @@ class OutputOptionsMixIn(six.with_metaclass(MixInMeta, object)):
)
)
def process_state_verbose(self):
if self.options.state_verbose == "True" or self.options.state_verbose == "true":
self.options.state_verbose = True
elif self.options.state_verbose == "False" or self.options.state_verbose == "false":
self.options.state_verbose = False
def _mixin_after_parsed(self):
group_options_selected = [
option for option in self.output_options_group.option_list if (