openstack
/
openstack-ansible-os_keystone
Code Issues Proposed changes

Remove dangling Default domain cfg file 

The multi-domain LDAP support added in
Ifa4c42f7dbcc40a256a3156f74f0150384f9ab87 left behind a
keystone.Default.conf file that causes Keystone errors when adding a
new domain backed by LDAP. This patch removes the file unless the
deployer has specifically created a domain called 'Default'.

This is an IRR rework of change I50ca6c1133c663aa374e45a04f7d0d53171d6941.

Closes-bug: 1547542

Change-Id: I309ac13812c64c6e3df5cac6adff5fc68900af60
This commit is contained in:
Major Hayden 2016-03-02 15:30:04 -06:00
parent 0214f9bd41
commit 299690795b
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tasks/keystone_ldap_setup.yml
View File

@ -39,3 +39,15 @@
tags:
- keystone-ldap-domain-config
# Bug 1547542 - Older versions of the keystone role would deploy a blank
# keystone.Default.conf and this will cause errors when adding LDAP-backed
# domains.
- name: Remove Keystone Default domain configuration file if not needed
file:
path: "{{ keystone_ldap_domain_config_dir }}/keystone.Default.conf"
state: absent
when: keystone_ldap.Default is not defined
notify:
- Restart Apache
tags:
- keystone-ldap-domain-config