Fix non-ldap domain backend setup
diff --git a/keystone/server.sls b/keystone/server.sls
index 1a5522d..e44e959 100644
--- a/keystone/server.sls
+++ b/keystone/server.sls
@@ -74,7 +74,7 @@
- defaults:
domain_name: {{ domain_name }}
-{%- if domain.ldap.tls.cacert is defined %}
+{%- if domain.get('ldap', {}).get('tls', {}).get('cacert', False) %}
keystone_domain_{{ domain_name }}_cacert:
file.managed:
- name: /etc/keystone/domains/{{ domain_name }}.pem
@@ -96,6 +96,17 @@
{%- endif %}
+{%- if server.get('ldap', {}).get('tls', {}).get('cacert', False) %}
+keystone_ldap_default_cacert:
+ file.managed:
+ - name: {{ server.ldap.tls.cacertfile }}
+ - contents_pillar: keystone:server:ldap:tls:cacert
+ - require:
+ - pkg: keystone_packages
+ - watch_in:
+ - service: keystone_service
+{%- endif %}
+
keystone_service:
service.running:
- name: {{ server.service_name }}