openstack/tripleo-common
Code Issues Proposed changes

Fix message type payload in rotate_fernet_keys workflow

Browse Source 
The rotate_fernet_keys workflow had a copy/paste error. It was using the
wrong message type in the zaqar message. This sets it to the correct type.
The patch also includes streamlining of the messaging, to follow a better
pattern.

Change-Id: I5ddf433f39a530afe40fe13e551a91577949f9f2
Closes-Bug: #1747945
This commit is contained in:
Brad P. Crochet 2018-02-07 11:02:15 -05:00
parent 0ec4793c7e
commit 86050e642d
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
workbooks/fernet-key-rotate.yaml
View File

@ -21,35 +21,26 @@ workflows:
rotate_keys:
action: tripleo.parameters.rotate_fernet_keys container=<% $.container %>
on-success: deploy_ssh_key
on-error: rotate_keys_set_status_failed
rotate_keys_set_status_failed:
on-success: notify_zaqar
publish:
on-error: notify_zaqar
publish-on-error:
status: FAILED
message: <% task(rotate_keys).result %>
message: <% task().result %>
deploy_ssh_key:
workflow: tripleo.validations.v1.copy_ssh_key
on-success: get_privkey
on-error: deploy_ssh_key_failed
deploy_ssh_key_failed:
on-success: notify_zaqar
publish:
on-error: notify_zaqar
publish-on-error:
status: FAILED
message: <% task(deploy_ssh_key).result %>
message: <% task().result %>
get_privkey:
action: tripleo.validations.get_privkey
on-success: deploy_keys
on-error: get_privkey_failed
get_privkey_failed:
on-success: notify_zaqar
publish:
on-error: notify_zaqar
publish-on-error:
status: FAILED
message: <% task(get_privkey).result %>
message: <% task().result %>
deploy_keys:
action: tripleo.ansible-playbook
@ -65,13 +56,14 @@ workflows:
fernet_keys: <% task(rotate_keys).result %>
use_openstack_credentials: true
playbook: /usr/share/tripleo-common/playbooks/rotate-keys.yaml
on-success: rotate_keys_set_status_passed
rotate_keys_set_status_passed:
on-success: notify_zaqar
publish:
status: SUCCESS
message: <% task(deploy_keys).result %>
message: <% task().result %>
on-error: notify_zaqar
publish-on-error:
status: FAILED
message: <% task().result %>
notify_zaqar:
action: zaqar.queue_post
@ -79,7 +71,7 @@ workflows:
queue_name: <% $.queue_name %>
messages:
body:
type: tripleo.plan_management.v1.get_passwords
type: tripleo.fernet_keys.v1.rotate_fernet_keys
payload:
status: <% $.status %>
message: <% $.get('message', '') %>