From aa80f81d304c4734f8556740871d57d86f0190f7 Mon Sep 17 00:00:00 2001 From: LinPeiWen <591171850@qq.com> Date: Wed, 10 Aug 2022 21:02:10 +0800 Subject: [PATCH] keystone: Remove redundant 'when' In a multi-controller node, the presence of "run_once: True" and "when: inventory_hostname == groups['keystone'][-1]" will cause the task to be skipped Closes-Bug: #1987982 Change-Id: I6a8f4ca285cda0675711b631aeed7ae4c992d879 --- ansible/roles/keystone/handlers/main.yml | 1 - ansible/roles/keystone/tasks/upgrade.yml | 1 - ..._trust_function_creators-variables-8628098891513dac.yaml | 6 ++++++ 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/bug-1987982-fix-keystone-log_bin_trust_function_creators-variables-8628098891513dac.yaml diff --git a/ansible/roles/keystone/handlers/main.yml b/ansible/roles/keystone/handlers/main.yml index a941a3e4de..570833d2d3 100644 --- a/ansible/roles/keystone/handlers/main.yml +++ b/ansible/roles/keystone/handlers/main.yml @@ -96,4 +96,3 @@ run_once: True when: - kolla_action == "upgrade" - - inventory_hostname == groups[service.group][-1] diff --git a/ansible/roles/keystone/tasks/upgrade.yml b/ansible/roles/keystone/tasks/upgrade.yml index 7a1df217d6..a9260131e2 100644 --- a/ansible/roles/keystone/tasks/upgrade.yml +++ b/ansible/roles/keystone/tasks/upgrade.yml @@ -45,5 +45,4 @@ value: 0 run_once: True when: - - inventory_hostname == groups['keystone'][-1] - not use_preconfigured_databases | bool diff --git a/releasenotes/notes/bug-1987982-fix-keystone-log_bin_trust_function_creators-variables-8628098891513dac.yaml b/releasenotes/notes/bug-1987982-fix-keystone-log_bin_trust_function_creators-variables-8628098891513dac.yaml new file mode 100644 index 0000000000..5319b1cd01 --- /dev/null +++ b/releasenotes/notes/bug-1987982-fix-keystone-log_bin_trust_function_creators-variables-8628098891513dac.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixed `bug #1987982 `_ + This bug caused the database log_bin_trust_function_creators variable + not to be set back to "OFF" after a keystone upgrade.