Merge "keystone: Remove redundant 'when'"

2022-08-30 19:36:45 +00:00
parent b6f9c1c492 aa80f81d30
commit 41803729f3
3 changed files with 6 additions and 2 deletions
--- 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]
--- 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
--- 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
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixed `bug #1987982  <https://bugs.launchpad.net/kolla-ansible/+bug/1987982>`_
+    This bug caused the database log_bin_trust_function_creators variable
+    not to be set back to "OFF" after a keystone upgrade.