openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Add missing step tag in updates/upgrades/ffu tasks"

This commit is contained in:
Zuul 2019-10-16 17:02:49 +00:00 committed by Gerrit Code Review
parent 7ee240cee0 af1e393e07
commit 1acbdb2fca
2 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/haproxy/haproxy-container-puppet.yaml
View File

@ -315,6 +315,7 @@ outputs:
state: directory
setype: var_log_t
recurse: yes
when: step|int == 1
post_upgrade_tasks:
- when: step|int == 1
import_role:

49
deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
View File

@ -402,16 +402,17 @@ outputs:
enabled: yes
state: started
fast_forward_upgrade_tasks:
- name: set is_bootstrap_node fact
set_fact: is_bootstrap_node={{tripleo_packages_short_bootstrap_node_name|lower == ansible_hostname|lower}}
- name: Register repo type and args
set_fact:
fast_forward_repo_type: {get_param: FastForwardRepoType}
fast_forward_repo_args: {get_param: FastForwardRepoArgs}
when: step|int == 3
- debug:
msg: "fast_forward_repo_type: {{ fast_forward_repo_type }} fast_forward_repo_args: {{ fast_forward_repo_args }}"
when: step|int == 3
- block:
- name: set is_bootstrap_node fact
set_fact: is_bootstrap_node={{tripleo_packages_short_bootstrap_node_name|lower == ansible_hostname|lower}}
- name: Register repo type and args
set_fact:
fast_forward_repo_type: {get_param: FastForwardRepoType}
fast_forward_repo_args: {get_param: FastForwardRepoArgs}
- debug:
msg: "fast_forward_repo_type: {{ fast_forward_repo_type }} fast_forward_repo_args: {{ fast_forward_repo_args }}"
when:
- step|int == 3
- block:
- name: clone tripleo-repos
git:
@ -424,9 +425,9 @@ outputs:
- name: Enable tripleo-repos
command: "tripleo-repos {{ fast_forward_repo_args.tripleo_repos[release] }}"
when:
- step|int == 3
- is_bootstrap_node|bool
- fast_forward_repo_type == 'tripleo-repos'
- step|int == 3
- is_bootstrap_node|bool
- fast_forward_repo_type == 'tripleo-repos'
- block:
- name: Create custom Script for upgrading repo.
copy:
@ -440,12 +441,15 @@ outputs:
- is_bootstrap_node|bool
- fast_forward_repo_type == 'custom-script'
fast_forward_post_upgrade_tasks:
- name: Register repo type and args
set_fact:
fast_forward_repo_type: {get_param: FastForwardRepoType}
fast_forward_repo_args: {get_param: FastForwardRepoArgs}
- debug:
msg: "fast_forward_repo_type: {{ fast_forward_repo_type }} fast_forward_repo_args: {{ fast_forward_repo_args }}"
- block:
- name: Register repo type and args
set_fact:
fast_forward_repo_type: {get_param: FastForwardRepoType}
fast_forward_repo_args: {get_param: FastForwardRepoArgs}
- debug:
msg: "fast_forward_repo_type: {{ fast_forward_repo_type }} fast_forward_repo_args: {{ fast_forward_repo_args }}"
when:
- step|int == 3
- block:
- name: clone tripleo-repos
git:
@ -458,9 +462,9 @@ outputs:
- name: Enable tripleo-repos
command: "tripleo-repos {{ fast_forward_repo_args.tripleo_repos[release] }}"
when:
- is_bootstrap_node|bool
- fast_forward_repo_type == 'tripleo-repos'
- step|int == 3
- is_bootstrap_node|bool
- fast_forward_repo_type == 'tripleo-repos'
- block:
- name: Create custom Script for upgrading repo.
copy:
@ -470,5 +474,6 @@ outputs:
- name: Execute custom script for upgrading repo.
shell: "/root/ffu_update_repo.sh {{release}}"
when:
- step|int == 3
- is_bootstrap_node|bool
- fast_forward_repo_type == 'custom-script'