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