openstack
/
tripleo-common
Code Issues Proposed changes

Merge "[stable/train only] Use nodes as hostnames if ironic lookup fails" into stable/train

This commit is contained in:
Zuul 2020-04-08 11:20:31 +00:00 committed by Gerrit Code Review
parent 55ed209b6c 22a170c69e
commit 11785ed8ab
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
workbooks/deployment.yaml
View File

@ -432,15 +432,15 @@ workflows:
uuids_to_names:
action: ironic.node_get_by_instance_uuid
on-success: get_private_key
# This task will fail on split-stack and nova-less deployment.
# We'll complete the conversion later in the cycle and backport to Train.
# https://bugs.launchpad.net/tripleo/+bug/1858459
on-error: ansible_skipped
on-complete: get_private_key
input:
instance_uuid: <% $.node %>
fields: ['instance_info']
with-items: node in <% $.nodes %>
publish-on-error:
limit_hosts: <% $.nodes.join(',') %>
publish:
limit_hosts: <% list(task().result.instance_info.display_name).join(',') %>
get_private_key:
action: tripleo.validations.get_privkey
@ -518,7 +518,7 @@ workflows:
override_ansible_cfg: <% $.override_ansible_cfg %>
command_timeout: <% $.config_download_timeout %>
execution_id: <% execution().id %>
limit_hosts: <% $.nodes and list(task(uuids_to_names).result.instance_info.display_name).join(',') or false %>
limit_hosts: <% $.nodes and $.get(limit_hosts) or false %>
skip_tags: <% $.skip_tags %>
publish:
log_path: <% task().result.get('log_path') %>
@ -540,13 +540,6 @@ workflows:
message: Ansible passed.
deployment_status: DEPLOY_SUCCESS
ansible_skipped:
on-success: send_message
publish:
status: SUCCESS
message: Ansible skipped.
deployment_status: DEPLOY_SUCCESS
ansible_timeout:
on-success: send_message
publish: