Ensure --limit option takes precedence over skiplist
Now that we've decided to ignore skiplist when limit
is specified, ensure we do that in master/ussuri.
Change-Id: I8a67554f268042d2cceebf3ec3b1f098f001bbfd
Related-Bug: #1857298
(cherry picked from commit a39424c19e
)
This commit is contained in:
parent
a29f42a531
commit
6c11a176b3
|
@ -395,17 +395,15 @@ def config_download(log, clients, stack, ssh_network=None,
|
|||
logger=log,
|
||||
print_msg=(verbosity == 0)
|
||||
)
|
||||
blacklist_show = stack.output_show('BlacklistedHostnames')
|
||||
blacklist_stack_output = blacklist_show.get('output', dict())
|
||||
blacklist_stack_output_value = blacklist_stack_output.get('output_value')
|
||||
if blacklist_stack_output_value:
|
||||
|
||||
if not limit_hosts:
|
||||
limit_hosts = ""
|
||||
|
||||
limit_hosts += (
|
||||
':'.join(['!{}'.format(i) for i in blacklist_stack_output_value
|
||||
if i]))
|
||||
if not limit_hosts:
|
||||
blacklist_show = stack.output_show('BlacklistedHostnames')
|
||||
blacklist_stack_output = blacklist_show.get('output', dict())
|
||||
blacklist_stack_output_value = blacklist_stack_output.get(
|
||||
'output_value')
|
||||
if blacklist_stack_output_value:
|
||||
limit_hosts = (
|
||||
':'.join(['!{}'.format(i) for i in blacklist_stack_output_value
|
||||
if i]))
|
||||
|
||||
_log_and_print(
|
||||
message='Retrieving configuration for stack: {}'.format(
|
||||
|
|
Loading…
Reference in New Issue