From 6c11a176b3a43b4a0a32e8e0c5f3c7f6f017eaf7 Mon Sep 17 00:00:00 2001 From: Rabi Mishra Date: Thu, 16 Jul 2020 13:09:51 +0530 Subject: [PATCH] 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 a39424c19e757a622e87f71731c34dfd6434983a) --- tripleoclient/workflows/deployment.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/tripleoclient/workflows/deployment.py b/tripleoclient/workflows/deployment.py index 669825fb7..3c2d68d94 100644 --- a/tripleoclient/workflows/deployment.py +++ b/tripleoclient/workflows/deployment.py @@ -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(