openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Fix the validation ssh keys workflow"

This commit is contained in:
Jenkins 2016-11-08 10:37:15 +00:00 committed by Gerrit Code Review
parent 5915c83934 65b276d3ec
commit 51086a645c
2 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
workbooks/deployment.yaml
View File

@ -108,20 +108,15 @@ workflows:
tasks:
add_validation_ssh_key:
workflow: tripleo.validations.v1.add_validation_ssh_key_parameter container=<% $.container %>
on-complete: deploy
deploy:
action: tripleo.deployment.deploy timeout=<% $.timeout %> container=<% $.container %>
on-success: test_validations_enabled
on-success: send_message
on-error: set_deployment_failed
test_validations_enabled:
action: tripleo.validations.enabled
on-success: copy_validation_ssh_keys
on-error: send_message
copy_validation_ssh_keys:
workflow: tripleo.validations.v1.copy_ssh_key
on-complete: send_message
set_deployment_failed:
on-success: send_message
publish:

32
workbooks/validations.yaml
View File

@ -180,6 +180,38 @@ workflows:
find_groups:
action: tripleo.validations.list_groups
add_validation_ssh_key_parameter:
input:
- container
- queue_name: tripleo
tasks:
test_validations_enabled:
action: tripleo.validations.enabled
on-success: get_pubkey
on-error: unset_validation_key_parameter
get_pubkey:
action: tripleo.validations.get_pubkey
on-success: set_validation_key_parameter
publish:
pubkey: <% task(get_pubkey).result %>
set_validation_key_parameter:
action: tripleo.parameters.update
input:
parameters:
node_admin_extra_ssh_keys: <% $.pubkey %>
container: <% $.container %>
# NOTE(shadower): We need to clear keys from a previous deployment
unset_validation_key_parameter:
action: tripleo.parameters.update
input:
parameters:
node_admin_extra_ssh_keys: ""
container: <% $.container %>
copy_ssh_key:
input:
- overcloud_admin: heat-admin