Merge "Fixes playbook runtime issues with ldap"

defaults/main.yml

@@ -288,6 +288,8 @@ neutron_rpc_conn_pool_size: 30
 neutron_rpc_response_timeout: 60
 neutron_rpc_workers: 1
 
+neutron_service_in_ldap: false
+
 ## Policy vars
 # Provide a list of access controls to update the default policy.json with. These changes will be merged
 # with the access controls in the default policy.json. E.g.

tasks/neutron_service_add.yml

@@ -43,6 +43,7 @@
     password: "{{ service_password }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
   register: add_service
+  when: not neutron_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 neutron_service_in_ldap | bool
   until: add_service|success
   retries: 5
   delay: 10