Fix condition for setting workload_memory fact.
workload_memory has default set so no need for extra condition.
Option 'workload_launch_post_composable_upgrade' in not valid
starting from Q hence no need to keep it.
Change-Id: I901f90174ed974efd90c99e43a378150a1c5e7f8
(cherry picked from commit 82b0ad633d
)
This commit is contained in:
parent
33537942a0
commit
a6d3936de4
|
@ -62,7 +62,6 @@ workload_user: "cirros"
|
|||
workload_disk: 5
|
||||
workload_vcpu: 1
|
||||
workload_swap: 512
|
||||
workload_launch_post_composable_upgrade: false
|
||||
|
||||
# note that both UC upgrade and update use the same template
|
||||
undercloud_upgrade_template: undercloud_upgrade.sh.j2
|
||||
|
|
|
@ -39,11 +39,6 @@
|
|||
set_fact:
|
||||
workload_swap: "{{ install.upgrade.workloadswap }}"
|
||||
|
||||
- name: Set upgrade workload post_composable_upgrade launch
|
||||
set_fact:
|
||||
workload_launch_post_composable_upgrade: true
|
||||
when: install.upgrade.postcomposable.workload
|
||||
|
||||
- name: Set undercloud upgrade
|
||||
set_fact:
|
||||
undercloud_upgrade: true
|
||||
|
|
Loading…
Reference in New Issue