Make sure we apply all deploy step-0 during update.
That step include, in particular, the puppet-container.py/sh creation file plus some other task that should happen very early during the deploy process. During update if a change in puppet-container.py happen in the template we have to trigger those steps to get the changes. This is especially critical because we run puppet container configuration during the update stage. Closes-Bug: #1853156 Change-Id: I26406da82c584dc5093c17ad26f263057a5cbcaa
This commit is contained in:
parent
bf8f14448f
commit
10a523a03d
|
@ -0,0 +1,18 @@
|
|||
- name: Deploy step tasks for step 0
|
||||
debug:
|
||||
msg: Use --start-at-task 'Deploy step tasks for step 0' to resume from this task
|
||||
when: "tripleo_minor_update is not defined or tripleo_minor_update != 'true'"
|
||||
- name: Create /var/lib/container-puppet
|
||||
no_log: True
|
||||
file: path=/var/lib/container-puppet state=directory setype=svirt_sandbox_file_t selevel=s0 recurse=true
|
||||
- name: Write container-puppet.py
|
||||
no_log: True
|
||||
copy: src=docker_puppet_script.yaml dest=/var/lib/container-puppet/container-puppet.py force=yes mode=0600
|
||||
- name: Write container-puppet.sh
|
||||
no_log: True
|
||||
copy: src=container_puppet_script.yaml dest=/var/lib/container-puppet/container-puppet.sh force=yes mode=0755
|
||||
|
||||
{%- for role in roles %}
|
||||
- import_tasks: {{role.name}}/deploy_steps_tasks.yaml
|
||||
when: tripleo_role_name == '{{role.name}}'
|
||||
{%- endfor %}
|
|
@ -372,6 +372,7 @@ outputs:
|
|||
cloud_domain: {get_param: CloudDomain}
|
||||
all_nodes_extra_map_data: {get_param: AllNodesExtraMapData}
|
||||
common_deploy_steps_tasks: {get_file: deploy-steps-tasks.yaml}
|
||||
deploy_steps_tasks_step_0: {get_file: deploy-steps-tasks-step-0.yaml}
|
||||
common_deploy_steps_tasks_step_1: {get_file: deploy-steps-tasks-step-1.yaml}
|
||||
container_startup_configs_tasks: {get_file: container_startup_configs_tasks.yaml}
|
||||
docker_puppet_script: {get_file: ./container-puppet.py}
|
||||
|
@ -493,23 +494,7 @@ outputs:
|
|||
docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
|
||||
docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET
|
||||
tasks:
|
||||
- name: Deploy step tasks for step 0
|
||||
debug:
|
||||
msg: Use --start-at-task 'Deploy step tasks for step 0' to resume from this task
|
||||
- name: Create /var/lib/container-puppet
|
||||
no_log: True
|
||||
file: path=/var/lib/container-puppet state=directory setype=svirt_sandbox_file_t selevel=s0 recurse=true
|
||||
- name: Write container-puppet.py
|
||||
no_log: True
|
||||
copy: src=docker_puppet_script.yaml dest=/var/lib/container-puppet/container-puppet.py force=yes mode=0600
|
||||
- name: Write container-puppet.sh
|
||||
no_log: True
|
||||
copy: src=container_puppet_script.yaml dest=/var/lib/container-puppet/container-puppet.sh force=yes mode=0755
|
||||
|
||||
{%- for role in roles %}
|
||||
- import_tasks: {{role.name}}/deploy_steps_tasks.yaml
|
||||
when: tripleo_role_name == '{{role.name}}'
|
||||
{%- endfor %}
|
||||
- import_tasks: deploy_steps_tasks_step_0.yaml
|
||||
tags:
|
||||
- overcloud
|
||||
- deploy_steps
|
||||
|
@ -958,6 +943,9 @@ outputs:
|
|||
loop_var: step
|
||||
- import_tasks: {{role.name}}/host_prep_tasks.yaml
|
||||
when: tripleo_role_name == '{{role.name}}'
|
||||
- import_tasks: deploy_steps_tasks_step_0.yaml
|
||||
vars:
|
||||
step: 0
|
||||
- import_tasks: common_deploy_steps_tasks_step_1.yaml
|
||||
- include_tasks: common_deploy_steps_tasks.yaml
|
||||
with_sequence: start=1 end={{deploy_steps_max-1}}
|
||||
|
|
Loading…
Reference in New Issue