diff --git a/defaults/main.yml b/defaults/main.yml
index 44313d81..2bce931e 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -235,6 +235,8 @@ nova_ceph_client_uuid: 517a4663-3927-44bc-9ea7-4a90e1cd4c66
 #  "compute:create": ""
 #  "compute:create:attach_network": ""
 
+nova_service_in_ldap: false
+
 ## libvirtd config options
 nova_libvirtd_listen_tls: 1
 nova_libvirtd_listen_tcp: 0
diff --git a/tasks/nova_service_add.yml b/tasks/nova_service_add.yml
index 13478fdc..60603fcf 100644
--- a/tasks/nova_service_add.yml
+++ b/tasks/nova_service_add.yml
@@ -43,6 +43,7 @@
     password: "{{ service_password }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
   register: add_service
+  when: not nova_service_in_ldap | bool
   until: add_service|success
   retries: 5
   delay: 10
@@ -62,6 +63,7 @@
     role_name: "{{ role_name }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
   register: add_service
+  when: not nova_service_in_ldap | bool
   until: add_service|success
   retries: 5
   delay: 10