Browse Source

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)
tags/8.7.1
James Slagle 11 months ago
parent
commit
ff147b237b

+ 2
- 0
workbooks/access.yaml View File

@@ -145,6 +145,7 @@ workflows:
145 145
                   wait_for_connection:
146 146
                     sleep: 5
147 147
                     timeout: 300
148
+          execution_id: <% execution().id %>
148 149
 
149 150
   create_admin_via_ssh:
150 151
     input:
@@ -172,3 +173,4 @@ workflows:
172 173
           playbook:
173 174
             - hosts: overcloud
174 175
               tasks: <% $.tasks %>
176
+          execution_id: <% execution().id %>

+ 1
- 0
workbooks/deployment.yaml View File

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

+ 1
- 0
workbooks/fernet-key-rotate.yaml View File

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

+ 2
- 0
workbooks/octavia_post.yaml View File

@@ -110,6 +110,7 @@ workflows:
110 110
             auth_username: <% $.auth_username %>
111 111
             auth_password: <% $.auth_password %>
112 112
             auth_project_name: <% $.auth_project_name %>
113
+          execution_id: <% execution().id %>
113 114
         on-success: config_octavia
114 115
 
115 116
       config_octavia:
@@ -150,6 +151,7 @@ workflows:
150 151
             generate_certs: <% $.generate_certs %>
151 152
             mgmt_port_dev: <% $.mgmt_port_dev %>
152 153
             auth_project_name: <% $.auth_project_name %>
154
+          execution_id: <% execution().id %>
153 155
         on-complete: purge_local_temp_dir
154 156
       purge_local_temp_dir:
155 157
         action: tripleo.files.remove_temp_dir path=<% $.undercloud_local_dir %>

+ 1
- 0
workbooks/skydive-ansible.yaml View File

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

+ 1
- 0
workbooks/swift_ring_rebalance.yaml View File

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

Loading…
Cancel
Save