Pass execution_id to tripleo.ansible-playbook.

Passing the execution_id to the tripleo.ansible-playbook action will
make it such that the execution_id is included in any messages sent on
the queue.

This is needed so that when tripleoclient filters by execution id to
discard messages that are not from workflows it did not start, won't be
shown.

The tripleoclient patch to filter on execution_id is
https://review.openstack.org/#/c/605520/, but first we must land this
patch so that execution_id is added an input to these actions.

Change-Id: Icbe80c338d69efc6ce8fceb0f73f833bec588536
Related-Bug: #1794277
(cherry picked from commit 678d564619)
This commit is contained in:
James Slagle 2018-09-27 19:17:08 -04:00 committed by Dougal Matthews
parent 52e039848e
commit ff147b237b
6 changed files with 8 additions and 0 deletions

View File

@ -145,6 +145,7 @@ workflows:
wait_for_connection: wait_for_connection:
sleep: 5 sleep: 5
timeout: 300 timeout: 300
execution_id: <% execution().id %>
create_admin_via_ssh: create_admin_via_ssh:
input: input:
@ -172,3 +173,4 @@ workflows:
playbook: playbook:
- hosts: overcloud - hosts: overcloud
tasks: <% $.tasks %> tasks: <% $.tasks %>
execution_id: <% execution().id %>

View File

@ -388,6 +388,7 @@ workflows:
reproduce_command: true reproduce_command: true
trash_output: true trash_output: true
blacklisted_hostnames: <% $.blacklisted_hostnames %> blacklisted_hostnames: <% $.blacklisted_hostnames %>
execution_id: <% execution().id %>
publish: publish:
log_path: <% task(run_ansible).result.get('log_path') %> log_path: <% task(run_ansible).result.get('log_path') %>
deployment_status: DEPLOY_SUCCESS deployment_status: DEPLOY_SUCCESS

View File

@ -56,6 +56,7 @@ workflows:
fernet_keys: <% task(rotate_keys).result %> fernet_keys: <% task(rotate_keys).result %>
use_openstack_credentials: true use_openstack_credentials: true
playbook: /usr/share/tripleo-common/playbooks/rotate-keys.yaml playbook: /usr/share/tripleo-common/playbooks/rotate-keys.yaml
execution_id: <% execution().id %>
on-success: notify_zaqar on-success: notify_zaqar
publish: publish:
status: SUCCESS status: SUCCESS

View File

@ -110,6 +110,7 @@ workflows:
auth_username: <% $.auth_username %> auth_username: <% $.auth_username %>
auth_password: <% $.auth_password %> auth_password: <% $.auth_password %>
auth_project_name: <% $.auth_project_name %> auth_project_name: <% $.auth_project_name %>
execution_id: <% execution().id %>
on-success: config_octavia on-success: config_octavia
config_octavia: config_octavia:
@ -150,6 +151,7 @@ workflows:
generate_certs: <% $.generate_certs %> generate_certs: <% $.generate_certs %>
mgmt_port_dev: <% $.mgmt_port_dev %> mgmt_port_dev: <% $.mgmt_port_dev %>
auth_project_name: <% $.auth_project_name %> auth_project_name: <% $.auth_project_name %>
execution_id: <% execution().id %>
on-complete: purge_local_temp_dir on-complete: purge_local_temp_dir
purge_local_temp_dir: purge_local_temp_dir:
action: tripleo.files.remove_temp_dir path=<% $.undercloud_local_dir %> action: tripleo.files.remove_temp_dir path=<% $.undercloud_local_dir %>

View File

@ -69,5 +69,6 @@ workflows:
ssh_private_key: <% $.private_key %> ssh_private_key: <% $.private_key %>
extra_env_variables: <% $.ansible_extra_env_variables %> extra_env_variables: <% $.ansible_extra_env_variables %>
extra_vars: <% $.extra_vars %> extra_vars: <% $.extra_vars %>
execution_id: <% execution().id %>
publish: publish:
output: <% task().result %> output: <% task().result %>

View File

@ -29,3 +29,4 @@ workflows:
playbook: /usr/share/tripleo-common/playbooks/swift_ring_rebalance.yaml playbook: /usr/share/tripleo-common/playbooks/swift_ring_rebalance.yaml
inventory: /usr/bin/tripleo-ansible-inventory inventory: /usr/bin/tripleo-ansible-inventory
use_openstack_credentials: true use_openstack_credentials: true
execution_id: <% execution().id %>