openstack
/
tripleo-common
Code Issues Proposed changes

When making sub-workflow calls, pass the queue_name 

When we make sud-workflow calls we should pass the queue name that was
provided. At the moment, with the CLI, we are only getting messages from
the "main" workflow, all the sub-workflow messages are going to the
"tripleo" queue, which is currently only consumed by the GUI.

Closes-Bug: #1648781
Change-Id: Icfb25e66ea50a2d7371a5d1b5ba03c46095bc65e
This commit is contained in:
Dougal Matthews 2016-12-02 14:59:45 +00:00
parent 9f391b3d74
commit 8490ebd7b5
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
workbooks/baremetal.yaml
View File

@ -126,7 +126,12 @@ workflows:
on-success: send_message
on-error: set_status_failed_nodes_managed
with-items: node in <% $.new_nodes %>
workflow: tripleo.baremetal.v1.set_node_state node_uuid=<% $.node.uuid %> state_action='manage' target_state='manageable'
workflow: tripleo.baremetal.v1.set_node_state
input:
node_uuid: <% $.node.uuid %>
queue_name: <% $.queue_name %>
state_action: 'manage'
target_state: 'manageable'
publish:
status: SUCCESS
message: Nodes set to managed.
@ -164,7 +169,12 @@ workflows:
on-success: try_power_off
on-error: set_status_failed_nodes_available
with-items: uuid in <% $.node_uuids %>
workflow: tripleo.baremetal.v1.set_node_state node_uuid=<% $.uuid %> state_action='provide' target_state='available'
workflow: tripleo.baremetal.v1.set_node_state
input:
node_uuid: <% $.uuid %>
queue_name: <% $.queue_name %>
state_action: 'provide'
target_state: 'available'
set_status_failed_nodes_available:
on-success: send_message
@ -176,7 +186,12 @@ workflows:
on-success: send_message
on-error: power_off_failed
with-items: uuid in <% $.node_uuids %>
workflow: tripleo.baremetal.v1.set_power_state node_uuid=<% $.uuid %> state_action='off' target_state='power off'
workflow: tripleo.baremetal.v1.set_power_state
input:
node_uuid: <% $.uuid %>
queue_name: <% $.queue_name %>
state_action: 'off'
target_state: 'power off'
publish:
status: SUCCESS
message: 'Successfully set nodes state to available.'
@ -511,13 +526,20 @@ workflows:
tag_nodes:
with-items: node_uuid in <% $.tag_node_uuids %>
workflow: tripleo.baremetal.v1.tag_node node_uuid=<% $.node_uuid %> role=<% $.role %>
workflow: tripleo.baremetal.v1.tag_node
input:
node_uuid: <% $.node_uuid %>
queue_name: <% $.queue_name %>
role: <% $.role %>
concurrency: 1
on-success: untag_nodes
untag_nodes:
with-items: node_uuid in <% $.untag_node_uuids %>
workflow: tripleo.baremetal.v1.tag_node node_uuid=<% $.node_uuid %>
workflow: tripleo.baremetal.v1.tag_node
input:
node_uuid: <% $.node_uuid %>
queue_name: <% $.queue_name %>
concurrency: 1
on-success: update_role_parameters

5
workbooks/deployment.yaml
View File

@ -109,7 +109,10 @@ workflows:
tasks:
add_validation_ssh_key:
workflow: tripleo.validations.v1.add_validation_ssh_key_parameter container=<% $.container %>
workflow: tripleo.validations.v1.add_validation_ssh_key_parameter
input:
container: <% $.container %>
queue_name: <% $.queue_name %>
on-complete: deploy
deploy: