Clean up node registration output.
The cell_v2_discover_hosts is an internal workflow
and doesn't need to send messages. It is retried by
the parent workflow as it is expected to fail, and
when it does we don't want it to send error messages
each time. which can be retried up to 30 times by
the parent workflow.
Conflicts:
workbooks/baremetal.yaml
Change-Id: I4b8f8d153a8e8c2eabb9efadb52cf685e1f3759f
Closes-Bug: #1710685
(cherry picked from commit 206dd5ddab
)
This commit is contained in:
parent
ee9a554532
commit
8315421b6d
|
@ -1175,7 +1175,6 @@ workflows:
|
|||
|
||||
input:
|
||||
- node_uuids
|
||||
- queue_name: tripleo
|
||||
|
||||
tags:
|
||||
- tripleo-common-managed
|
||||
|
@ -1184,42 +1183,12 @@ workflows:
|
|||
|
||||
cell_v2_discover_hosts:
|
||||
on-success: wait_for_nova_resources
|
||||
on-error: cell_v2_discover_hosts_failed
|
||||
action: tripleo.baremetal.cell_v2_discover_hosts
|
||||
|
||||
cell_v2_discover_hosts_failed:
|
||||
on-success: send_message
|
||||
publish:
|
||||
status: FAILED
|
||||
message: <% task(cell_v2_discover_hosts).result %>
|
||||
|
||||
wait_for_nova_resources:
|
||||
on-success: send_message
|
||||
on-error: wait_for_nova_resources_failed
|
||||
with-items: node_uuid in <% $.node_uuids %>
|
||||
action: nova.hypervisors_find hypervisor_hostname=<% $.node_uuid %>
|
||||
|
||||
wait_for_nova_resources_failed:
|
||||
on-success: send_message
|
||||
publish:
|
||||
status: FAILED
|
||||
message: <% task(wait_for_nova_resources).result %>
|
||||
|
||||
send_message:
|
||||
action: zaqar.queue_post
|
||||
retry: count=5 delay=1
|
||||
input:
|
||||
queue_name: <% $.queue_name %>
|
||||
messages:
|
||||
body:
|
||||
type: tripleo.baremetal.v1.cellv2_discovery
|
||||
payload:
|
||||
status: <% $.get('status', 'SUCCESS') %>
|
||||
message: <% $.get('message', '') %>
|
||||
execution: <% execution() %>
|
||||
on-success:
|
||||
- fail: <% $.get('status') = "FAILED" %>
|
||||
|
||||
|
||||
discover_nodes:
|
||||
description: Run nodes discovery over the given IP range
|
||||
|
|
Loading…
Reference in New Issue