openstack/tripleo-common
Code Issues Proposed changes

Use /var/lib/mistral/<plan-name> as config-download dir

Browse Source 
Use a consistent directory under /var/lib/mistral (which defaults to the
plan name) as the working and config-download directory in the
config_download_deploy workflow. Since the config-download directory
is now managed by git, we can re-use the same dir and preserve the
history.

Change-Id: Id639d0a99aa1103f6f9cc54de676ea8ba6111332
Closes-Bug: #1779093
This commit is contained in:
James Slagle 2018-07-02 12:37:13 -04:00
parent ec40eb3edf
commit 81b022ce03
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
releasenotes/notes/config-download-consistent-work-dir-b8a37550c3970722.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- The config_download_deploy workflow now uses a consistent working directory
for the config-download directory. Since the directory is now managed by
git, it can be reused across executions.

18
workbooks/deployment.yaml
View File

@ -385,7 +385,7 @@ workflows:
download_config:
action: tripleo.config.download_config
input:
work_dir: <% $.get('work_dir') %>/<% execution().id %>
work_dir: <% $.get('work_dir') %>/<% $.get('plan_name') %>
container_config: <% $.get('plan_name') %>-config
on-success: send_msg_config_download
on-error: send_message
@ -402,7 +402,7 @@ workflows:
status: <% $.get('status', 'RUNNING') %>
deployment_status: DEPLOYING
execution: <% execution() %>
message: Config downloaded at <% $.get('work_dir') %>/<% execution().id %>
message: Config downloaded at <% $.get('work_dir') %>/<% $.get('plan_name') %>
plan_name: <% $.plan_name %>
on-success: get_private_key
@ -421,7 +421,7 @@ workflows:
action: tripleo.ansible-generate-inventory
input:
ansible_ssh_user: tripleo-admin
work_dir: <% $.get('work_dir') %>/<% execution().id %>
work_dir: <% $.get('work_dir') %>/<% $.get('plan_name') %>
plan_name: <% $.get('plan_name') %>
ssh_network: <% $.get('ssh_network') %>
publish:
@ -455,8 +455,8 @@ workflows:
execution: <% execution() %>
plan_name: <% $.plan_name %>
message: >
Running ansible playbook at <% $.get('work_dir') %>/<% execution().id %>/deploy_steps_playbook.yaml.
See log file at <% $.get('work_dir') %>/<% execution().id %>/ansible.log for progress.
Running ansible playbook at <% $.get('work_dir') %>/<% $.get('plan_name') %>/deploy_steps_playbook.yaml.
See log file at <% $.get('work_dir') %>/<% $.get('plan_name') %>/ansible.log for progress.
...
on-success: run_ansible
@ -464,7 +464,7 @@ workflows:
action: tripleo.ansible-playbook
input:
inventory: <% $.inventory %>
playbook: <% $.get('work_dir') %>/<% execution().id %>/deploy_steps_playbook.yaml
playbook: <% $.get('work_dir') %>/<% $.get('plan_name') %>/deploy_steps_playbook.yaml
playbook_name: deploy_steps_playbook.yaml
plan_name: <% $.plan_name %>
remote_user: tripleo-admin
@ -473,7 +473,7 @@ workflows:
verbosity: <% $.get('verbosity') %>
become: true
timeout: <% $.timeout %>
work_dir: <% $.get('work_dir') %>/<% execution().id %>
work_dir: <% $.get('work_dir') %>/<% $.get('plan_name') %>
queue_name: <% $.queue_name %>
reproduce_command: true
trash_output: true
@ -487,7 +487,7 @@ workflows:
on-error: send_message
publish-on-error:
status: FAILED
message: Ansible failed, check log at <% $.get('work_dir') %>/<% execution().id %>/ansible.log.
message: Ansible failed, check log at <% $.get('work_dir') %>/<% $.get('plan_name') %>/ansible.log.
deployment_status: DEPLOY_FAILED
ansible_passed:
@ -501,7 +501,7 @@ workflows:
on-success: send_message
publish:
status: FAILED
message: Ansible failed, check log at <% $.get('work_dir') %>/<% execution().id %>/ansible.log.
message: Ansible failed, check log at <% $.get('work_dir') %>/<% $.get('plan_name') %>/ansible.log.
deployment_status: DEPLOY_FAILED
send_message: