openstack
/
tripleo-common
Code Issues Proposed changes

Use the standard messaging in the support workbook 

Update the support workbook to use the standard message sending
workflow. This workflow reduces the boilerplate that is copied between
workflows by defining the message structure, providing the retry logic
and ensuring the task on a "FAILED" message.

The workflow also offers optional persistence in Swift. If the plan name
is given to the workflow it will store the messages in a Swift container
named <plan_name>-messages.

Change-Id: I9f914489630b9de59ffa819093b8b54e135877e8
Related-Bug: #1757372
This commit is contained in:
Dougal Matthews 2018-06-18 16:30:50 +01:00
parent dcc95d37f5
commit b1be9bf25b
1 changed files with 25 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
workbooks/support.yaml
View File

@ -43,19 +43,13 @@ workflows:
# status messaging
send_message:
action: zaqar.queue_post
retry: count=5 delay=1
workflow: tripleo.messaging.v1.send
input:
queue_name: <% $.queue_name %>
messages:
body:
type: <% $.get('type', 'tripleo.support.v1.collect_logs') %>
payload:
status: <% $.get('status', 'SUCCESS') %>
message: <% $.get('message', '') %>
execution: <% execution() %>
on-success:
- fail: <% $.get('status') = 'FAILED' %>
type: <% $.get('type', execution().name) %>
status: <% $.get('status', 'SUCCESS') %>
execution: <% execution() %>
message: <% $.get('message', '') %>
upload_logs:
description: >
@ -122,19 +116,13 @@ workflows:
# status messaging
send_message:
action: zaqar.queue_post
retry: count=5 delay=1
workflow: tripleo.messaging.v1.send
input:
queue_name: <% $.queue_name %>
messages:
body:
type: <% $.get('type', 'tripleo.support.v1.upload_logs') %>
payload:
status: <% $.get('status', 'SUCCESS') %>
message: <% $.get('message', '') %>
execution: <% execution() %>
on-success:
- fail: <% $.get('status') = 'FAILED' %>
type: <% $.get('type', execution().name) %>
status: <% $.get('status', 'SUCCESS') %>
execution: <% execution() %>
message: <% $.get('message', '') %>
create_container:
description: >
@ -172,19 +160,13 @@ workflows:
# status messaging
send_message:
action: zaqar.queue_post
retry: count=5 delay=1
workflow: tripleo.messaging.v1.send
input:
queue_name: <% $.queue_name %>
messages:
body:
type: <% $.get('type', 'tripleo.support.v1.create_container') %>
payload:
status: <% $.get('status', 'SUCCESS') %>
message: <% $.get('message', '') %>
execution: <% execution() %>
on-success:
- fail: <% $.get('status') = 'FAILED' %>
type: <% $.get('type', execution().name) %>
status: <% $.get('status', 'SUCCESS') %>
execution: <% execution() %>
message: <% $.get('message', '') %>
delete_container:
description: >
@ -259,20 +241,13 @@ workflows:
# status messaging
send_message:
action: zaqar.queue_post
wait-before: 5
retry: count=5 delay=1
workflow: tripleo.messaging.v1.send
input:
queue_name: <% $.queue_name %>
messages:
body:
type: <% $.get('type', 'tripleo.support.v1.delete_container') %>
payload:
status: <% $.get('status', 'SUCCESS') %>
message: <% $.get('message', '') %>
execution: <% execution() %>
on-success:
- fail: <% $.get('status') = 'FAILED' %>
type: <% $.get('type', execution().name) %>
status: <% $.get('status', 'SUCCESS') %>
execution: <% execution() %>
message: <% $.get('message', '') %>
fetch_logs:
description: >
@ -350,16 +325,10 @@ workflows:
# status messaging
send_message:
action: zaqar.queue_post
retry: count=5 delay=1
workflow: tripleo.messaging.v1.send
input:
queue_name: <% $.queue_name %>
messages:
body:
type: <% $.get('type', 'tripleo.support.v1.fetch_logs') %>
payload:
status: <% $.get('status', 'SUCCESS') %>
message: <% $.get('message', '') %>
execution: <% execution() %>
on-success:
- fail: <% $.get('status') = 'FAILED' %>
type: <% $.get('type', execution().name) %>
status: <% $.get('status', 'SUCCESS') %>
execution: <% execution() %>
message: <% $.get('message', '') %>