From 3a6a55b8d03c1668c2edee7ff5b054cbe6a9c580 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 28 Nov 2018 11:43:14 +0000 Subject: [PATCH] Ensure that LDAP config is deployed on all keystone hosts In I66ed21cdcf42d0c2012062c8cf74305fecbec312 the condition meant for the setup of the domain was mistakenly applied to all tasks including laying down the template. This patch moves the conditional which ensures the domain is setup on the first host to the task in question to ensure that everything is good and well with the world again. Change-Id: Icb7c2556306d459534e6791f16c7013d0e9fcaf5 Closes-Bug: #1804827 --- tasks/keystone_ldap_setup.yml | 2 ++ tasks/main.yml | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tasks/keystone_ldap_setup.yml b/tasks/keystone_ldap_setup.yml index 705eb6d9..6844a2e2 100644 --- a/tasks/keystone_ldap_setup.yml +++ b/tasks/keystone_ldap_setup.yml @@ -26,6 +26,8 @@ delay: 10 with_dict: "{{ keystone_ldap }}" delegate_to: "{{ keystone_service_setup_host }}" + when: + - "inventory_hostname == ((groups['keystone_all'] | intersect(ansible_play_hosts)) | list)[-1]" vars: ansible_python_interpreter: >- {{ (keystone_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable']) }} diff --git a/tasks/main.yml b/tasks/main.yml index e98452b7..dcb4eea7 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -142,7 +142,6 @@ - include_tasks: keystone_ldap_setup.yml when: - - "inventory_hostname == ((groups['keystone_all'] | intersect(ansible_play_hosts)) | list)[-1]" - "keystone_service_setup | bool" tags: - keystone-config