openstack/openstack-ansible
Code Issues Proposed changes

Fix for keystone LDAP pkg missing

Browse Source 
This change adds the python-ldap package to keystone by default and
improves the conditional by which the ldap domain specific config
drivers are loaded.

Change-Id: Idf85bb109654cbb46755928504d6a19c090a7514
Closes-bug: 1497669
This commit is contained in:
Kevin Carter 2015-09-20 00:02:46 -05:00 committed by Jesse Pretorius
parent 88c948c455
commit f32def0216
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
playbooks/roles/os_keystone/defaults/main.yml
View File

@ -346,6 +346,7 @@ keystone_pip_packages:
- pycrypto - pycrypto
- pysaml2 - pysaml2
- python-keystoneclient - python-keystoneclient
- python-ldap
- python-memcached - python-memcached
- python-openstackclient - python-openstackclient
- repoze.lru - repoze.lru

2
playbooks/roles/os_keystone/templates/keystone.conf.j2
View File

@ -66,7 +66,7 @@ max_active_keys = {{ keystone_fernet_tokens_max_active_keys }}
[identity] [identity]
driver = {{ keystone_identity_driver }} driver = {{ keystone_identity_driver }}
{% if keystone_ldap is defined %} {% if keystone_ldap is defined and keystone_ldap.ldap %}
domain_config_dir = {{ keystone_ldap_domain_config_dir }} domain_config_dir = {{ keystone_ldap_domain_config_dir }}
domain_specific_drivers_enabled = True domain_specific_drivers_enabled = True
{% endif %} {% endif %}