Browse Source

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)
tags/13.4.0
Rabi Mishra 2 months ago
committed by Emilien Macchi
parent
commit
6c11a176b3
1 changed files with 9 additions and 11 deletions
  1. +9
    -11
      tripleoclient/workflows/deployment.py

+ 9
- 11
tripleoclient/workflows/deployment.py View File

@@ -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…
Cancel
Save