Merge "Add missing step tag in updates/upgrades/ffu tasks"
This commit is contained in:
commit
1acbdb2fca
|
@ -315,6 +315,7 @@ outputs:
|
||||||
state: directory
|
state: directory
|
||||||
setype: var_log_t
|
setype: var_log_t
|
||||||
recurse: yes
|
recurse: yes
|
||||||
|
when: step|int == 1
|
||||||
post_upgrade_tasks:
|
post_upgrade_tasks:
|
||||||
- when: step|int == 1
|
- when: step|int == 1
|
||||||
import_role:
|
import_role:
|
||||||
|
|
|
@ -402,16 +402,17 @@ outputs:
|
||||||
enabled: yes
|
enabled: yes
|
||||||
state: started
|
state: started
|
||||||
fast_forward_upgrade_tasks:
|
fast_forward_upgrade_tasks:
|
||||||
|
- block:
|
||||||
- name: set is_bootstrap_node fact
|
- name: set is_bootstrap_node fact
|
||||||
set_fact: is_bootstrap_node={{tripleo_packages_short_bootstrap_node_name|lower == ansible_hostname|lower}}
|
set_fact: is_bootstrap_node={{tripleo_packages_short_bootstrap_node_name|lower == ansible_hostname|lower}}
|
||||||
- name: Register repo type and args
|
- name: Register repo type and args
|
||||||
set_fact:
|
set_fact:
|
||||||
fast_forward_repo_type: {get_param: FastForwardRepoType}
|
fast_forward_repo_type: {get_param: FastForwardRepoType}
|
||||||
fast_forward_repo_args: {get_param: FastForwardRepoArgs}
|
fast_forward_repo_args: {get_param: FastForwardRepoArgs}
|
||||||
when: step|int == 3
|
|
||||||
- debug:
|
- debug:
|
||||||
msg: "fast_forward_repo_type: {{ fast_forward_repo_type }} fast_forward_repo_args: {{ fast_forward_repo_args }}"
|
msg: "fast_forward_repo_type: {{ fast_forward_repo_type }} fast_forward_repo_args: {{ fast_forward_repo_args }}"
|
||||||
when: step|int == 3
|
when:
|
||||||
|
- step|int == 3
|
||||||
- block:
|
- block:
|
||||||
- name: clone tripleo-repos
|
- name: clone tripleo-repos
|
||||||
git:
|
git:
|
||||||
|
@ -440,12 +441,15 @@ outputs:
|
||||||
- is_bootstrap_node|bool
|
- is_bootstrap_node|bool
|
||||||
- fast_forward_repo_type == 'custom-script'
|
- fast_forward_repo_type == 'custom-script'
|
||||||
fast_forward_post_upgrade_tasks:
|
fast_forward_post_upgrade_tasks:
|
||||||
|
- block:
|
||||||
- name: Register repo type and args
|
- name: Register repo type and args
|
||||||
set_fact:
|
set_fact:
|
||||||
fast_forward_repo_type: {get_param: FastForwardRepoType}
|
fast_forward_repo_type: {get_param: FastForwardRepoType}
|
||||||
fast_forward_repo_args: {get_param: FastForwardRepoArgs}
|
fast_forward_repo_args: {get_param: FastForwardRepoArgs}
|
||||||
- debug:
|
- debug:
|
||||||
msg: "fast_forward_repo_type: {{ fast_forward_repo_type }} fast_forward_repo_args: {{ fast_forward_repo_args }}"
|
msg: "fast_forward_repo_type: {{ fast_forward_repo_type }} fast_forward_repo_args: {{ fast_forward_repo_args }}"
|
||||||
|
when:
|
||||||
|
- step|int == 3
|
||||||
- block:
|
- block:
|
||||||
- name: clone tripleo-repos
|
- name: clone tripleo-repos
|
||||||
git:
|
git:
|
||||||
|
@ -458,9 +462,9 @@ outputs:
|
||||||
- name: Enable tripleo-repos
|
- name: Enable tripleo-repos
|
||||||
command: "tripleo-repos {{ fast_forward_repo_args.tripleo_repos[release] }}"
|
command: "tripleo-repos {{ fast_forward_repo_args.tripleo_repos[release] }}"
|
||||||
when:
|
when:
|
||||||
|
- step|int == 3
|
||||||
- is_bootstrap_node|bool
|
- is_bootstrap_node|bool
|
||||||
- fast_forward_repo_type == 'tripleo-repos'
|
- fast_forward_repo_type == 'tripleo-repos'
|
||||||
|
|
||||||
- block:
|
- block:
|
||||||
- name: Create custom Script for upgrading repo.
|
- name: Create custom Script for upgrading repo.
|
||||||
copy:
|
copy:
|
||||||
|
@ -470,5 +474,6 @@ outputs:
|
||||||
- name: Execute custom script for upgrading repo.
|
- name: Execute custom script for upgrading repo.
|
||||||
shell: "/root/ffu_update_repo.sh {{release}}"
|
shell: "/root/ffu_update_repo.sh {{release}}"
|
||||||
when:
|
when:
|
||||||
|
- step|int == 3
|
||||||
- is_bootstrap_node|bool
|
- is_bootstrap_node|bool
|
||||||
- fast_forward_repo_type == 'custom-script'
|
- fast_forward_repo_type == 'custom-script'
|
||||||
|
|
Loading…
Reference in New Issue