Merge "Fix condition for setting workload_memory fact." into stable/rocky

This commit is contained in:
Zuul 2019-01-22 22:04:00 +00:00 committed by Gerrit Code Review
commit 6f70d28f28
2 changed files with 0 additions and 6 deletions

View File

@ -62,7 +62,6 @@ workload_user: "cirros"
workload_disk: 5 workload_disk: 5
workload_vcpu: 1 workload_vcpu: 1
workload_swap: 512 workload_swap: 512
workload_launch_post_composable_upgrade: false
# note that both UC upgrade and update use the same template # note that both UC upgrade and update use the same template
undercloud_upgrade_template: undercloud_upgrade.sh.j2 undercloud_upgrade_template: undercloud_upgrade.sh.j2

View File

@ -39,11 +39,6 @@
set_fact: set_fact:
workload_swap: "{{ install.upgrade.workloadswap }}" 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 - name: Set undercloud upgrade
set_fact: set_fact:
undercloud_upgrade: true undercloud_upgrade: true