openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Merge "Fixes playbook runtime issues with ldap"

Browse Source
This commit is contained in:
Jenkins 2015-12-08 22:36:30 +00:00 committed by Gerrit Code Review
commit 8d456689e6
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/main.yml
View File

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

2
tasks/neutron_service_add.yml
View File

@ -43,6 +43,7 @@
password: "{{ service_password }}" password: "{{ service_password }}"
insecure: "{{ keystone_service_adminuri_insecure }}" insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service register: add_service
when: not neutron_service_in_ldap | bool
until: add_service|success until: add_service|success
retries: 5 retries: 5
delay: 10 delay: 10
@ -62,6 +63,7 @@
role_name: "{{ role_name }}" role_name: "{{ role_name }}"
insecure: "{{ keystone_service_adminuri_insecure }}" insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service register: add_service
when: not neutron_service_in_ldap | bool
until: add_service|success until: add_service|success
retries: 5 retries: 5
delay: 10 delay: 10