openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Ensure --limit option takes precedence over skiplist"

Browse Source
This commit is contained in:
Zuul
2020-07-21 02:01:58 +00:00
committed by Gerrit Code Review
parent 11da43c4e6 a39424c19e
commit 43de71e6b6
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tripleoclient/workflows/deployment.py
View File

@@ -390,17 +390,15 @@ def config_download(log, clients, stack, ssh_network='ctlplane',
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]))
key_file = utils.get_key(stack.stack_name)
python_interpreter = deployment_options.get('ansible_python_interpreter')