Merge "Disable Leapp when using OOOQ"
This commit is contained in:
commit
c13f918cc5
|
@ -106,6 +106,14 @@
|
|||
force: true
|
||||
when: upgrade_remove_rpm|bool
|
||||
|
||||
- name: create disable-leapp env file
|
||||
template:
|
||||
src: "disable-leapp.yaml.j2"
|
||||
dest: "{{ working_dir }}/disable-leapp.yaml"
|
||||
mode: 0755
|
||||
force: true
|
||||
when: use_oooq|default(false)|bool
|
||||
|
||||
- name: import tasks from sh_config_skip_host
|
||||
import_tasks: ../common/ssh_config_skip_host.yml
|
||||
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
parameter_defaults:
|
||||
UpgradeLeappEnabled: false
|
|
@ -43,6 +43,9 @@ openstack overcloud{% if ffu_overcloud_upgrade %} ffwd-upgrade {% else %} upgrad
|
|||
{% if upgrade_remove_rpm|default(false)|bool -%}
|
||||
-e {{ working_dir }}/remove-packages.yaml \
|
||||
{% endif -%}
|
||||
{% if use_oooq|default(false)|bool -%}
|
||||
-e {{ working_dir }}/disable-leapp.yaml \
|
||||
{% endif -%}
|
||||
{% if upgrade_prepare_extra_params -%}
|
||||
-e {{ upgrade_prepare_extra_params | join(' -e ') }} \
|
||||
{% endif -%}
|
||||
|
|
Loading…
Reference in New Issue