openstack/tripleo-ansible
Code Issues Proposed changes

Merge "tripleo-kernel: fixing naming of workload protection"

Browse Source
This commit is contained in:
Zuul 2021-09-30 21:37:46 +00:00 committed by Gerrit Code Review
commit 2342bf1392
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tripleo_ansible/roles/tripleo_kernel/defaults/main.yml
View File

@ -23,4 +23,3 @@ tripleo_kernel_args: ""
tripleo_kernel_reboot_timeout: 3600
tripleo_kernel_post_reboot_delay: 60
tripleo_kernel_defer_reboot: false
tripleo_kernel_reboot_protection: false

7
tripleo_ansible/roles/tripleo_kernel/tasks/kernelargs.yml
View File

@ -38,10 +38,9 @@
Automated reboot for this node has been defered because it is already provisionned.
Please schedule a manual reboot after this deployment is completed.
- name: Setting defer reboot fact
- name: Setting workload protection fact
set_fact:
tripleo_kernel_defer_reboot: true
tripleo_kernel_reboot_protection: true
_workload_protection: true
- name: Check if the kernelargs entry is already present in the file
replace:
@ -126,7 +125,7 @@
when:
- reboot_required is defined and reboot_required
- not tripleo_kernel_defer_reboot|bool
- not tripleo_kernel_reboot_protection|bool
- not _workload_protection|default(false)|bool
block:
- name: Reboot tasks
include_tasks: reboot.yaml