Skip to content
This repository has been archived by the owner. It is now read-only.

Commit 56e94ce

Browse files
committed
Deprecate show_profile keyword argument
1 parent 5f8402f commit 56e94ce

File tree

1 file changed

+12
-16
lines changed

1 file changed

+12
-16
lines changed

_modules/hubble.py

+12-16
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@ def audit(configs=None,
8383
`hubblestack:nova:show_compliance` in minion config/pillar.
8484
8585
show_profile
86-
Whether to add the profile path to the verbose output for audits.
87-
Defaults to True. Configurable via `hubblestack:nova:show_profile`
88-
in minion config/pillar.
86+
DEPRECATED
8987
9088
called_from_top
9189
Ignore this argument. It is used for distinguishing between user-calls
@@ -107,9 +105,7 @@ def audit(configs=None,
107105
if configs is None:
108106
return top(verbose=verbose,
109107
show_success=show_success,
110-
show_compliance=show_compliance,
111-
show_profile=show_profile,
112-
debug=debug)
108+
show_compliance=show_compliance)
113109

114110
if __salt__['config.get']('hubblestack:nova:autoload', True):
115111
load()
@@ -122,8 +118,10 @@ def audit(configs=None,
122118
show_success = __salt__['config.get']('hubblestack:nova:show_success', True)
123119
if show_compliance is None:
124120
show_compliance = __salt__['config.get']('hubblestack:nova:show_compliance', True)
125-
if show_profile is None:
126-
show_profile = __salt__['config.get']('hubblestack:nova:show_profile', True)
121+
if show_profile is not None:
122+
log.warning(
123+
'Keyword argument \'show_profile\' is no longer supported'
124+
)
127125
if debug is None:
128126
debug = __salt__['config.get']('hubblestack:nova:debug', False)
129127

@@ -389,9 +387,7 @@ def top(topfile='top.nova',
389387
`hubblestack:nova:show_compliance` in minion config/pillar.
390388
391389
show_profile
392-
Whether to add the profile path to the verbose output for audits.
393-
Defaults to True. Configurable via `hubblestack:nova:show_profile`
394-
in minion config/pillar.
390+
DEPRECATED
395391
396392
debug
397393
Whether to log additional information to help debug nova. Defaults to
@@ -417,8 +413,10 @@ def top(topfile='top.nova',
417413
show_success = __salt__['config.get']('hubblestack:nova:show_success', True)
418414
if show_compliance is None:
419415
show_compliance = __salt__['config.get']('hubblestack:nova:show_compliance', True)
420-
if show_profile is None:
421-
show_profile = __salt__['config.get']('hubblestack:nova:show_profile', True)
416+
if show_profile is not None:
417+
log.warning(
418+
'Keyword argument \'show_profile\' is no longer supported'
419+
)
422420
if debug is None:
423421
debug = __salt__['config.get']('hubblestack:nova:debug', False)
424422

@@ -456,9 +454,7 @@ def top(topfile='top.nova',
456454
verbose=verbose,
457455
show_success=True,
458456
show_compliance=False,
459-
show_profile=show_profile,
460-
called_from_top=True,
461-
debug=debug)
457+
called_from_top=True)
462458

463459
# Merge in the results
464460
for key, val in ret.iteritems():

0 commit comments

Comments
 (0)