From ec55b5a4339f367f77d93fe5a49609e10cd03024 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Mon, 23 Nov 2015 14:35:16 -0600 Subject: [PATCH] Fixes playbook runtime issues with ldap When using an LDAP backend the plabooks fail when "ensuring.*" which is a keystone client action. The reason for the failure is related to how ldap backend, and is triggered when the service users are within the ldap and not SQL. To resolve the issue a boolean conditional was created on the various OS_.* roles to skip specific tasks when the service users have already been added into LDAP. Change-Id: I64a8d1e926c54b821f8bfb561a8b6f755bc1ed93 Closes-Bug: #1518351 Closes-Bug: #1519174 Signed-off-by: Kevin Carter --- defaults/main.yml | 2 ++ tasks/glance_service_setup.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index ceffaacc..659d1f16 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -165,6 +165,8 @@ glance_rbd_store_pool: images glance_rbd_store_user: '{{ glance_ceph_client }}' glance_rbd_store_chunk_size: 8 +glance_service_in_ldap: false + # Common apt packages glance_apt_packages: - rpcbind diff --git a/tasks/glance_service_setup.yml b/tasks/glance_service_setup.yml index a154d8af..e061d721 100644 --- a/tasks/glance_service_setup.yml +++ b/tasks/glance_service_setup.yml @@ -43,6 +43,7 @@ password: "{{ glance_service_password }}" insecure: "{{ keystone_service_adminuri_insecure }}" register: add_service + when: not glance_service_in_ldap | bool until: add_service|success retries: 5 delay: 10 @@ -62,6 +63,7 @@ role_name: "{{ glance_role_name }}" insecure: "{{ keystone_service_adminuri_insecure }}" register: add_service + when: not glance_service_in_ldap | bool until: add_service|success retries: 5 delay: 10