Merge "Pass execution_id to tripleo.ansible-playbook."

workbooks/access.yaml

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

workbooks/deployment.yaml

@@ -517,6 +517,7 @@ workflows:
           blacklisted_hostnames: <% $.blacklisted_hostnames %>
           override_ansible_cfg: <% $.override_ansible_cfg %>
           command_timeout: <% $.config_download_timeout %>
+          execution_id: <% execution().id %>
         publish:
           log_path: <% task().result.get('log_path') %>
           deployment_status: DEPLOY_SUCCESS

workbooks/fernet-key-rotate.yaml

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

workbooks/octavia_post.yaml

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

workbooks/skydive-ansible.yaml

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

workbooks/swift_ring_rebalance.yaml

@@ -31,3 +31,4 @@ workflows:
           playbook: /usr/share/tripleo-common/playbooks/swift_ring_rebalance.yaml
           inventory: <% $.get('work_dir') %>/<% $.get('container') %>/tripleo-ansible-inventory.yaml
           use_openstack_credentials: true
+          execution_id: <% execution().id %>