Merge "LDAP packages are missing"
diff --git a/README.rst b/README.rst
index 1e0e822..14403eb 100644
--- a/README.rst
+++ b/README.rst
@@ -202,16 +202,17 @@
keystone:
server:
domain:
- description: "Testing domain"
- backend: ldap
- assignment:
- backend: sql
- ldap:
- url: "ldaps://idm.domain.com"
- suffix: "dc=cloud,dc=domain,dc=com"
- # Will bind as uid=keystone,cn=users,cn=accounts,dc=cloud,dc=domain,dc=com
- uid: keystone
- password: password
+ external:
+ description: "Testing domain"
+ backend: ldap
+ assignment:
+ backend: sql
+ ldap:
+ url: "ldaps://idm.domain.com"
+ suffix: "dc=cloud,dc=domain,dc=com"
+ # Will bind as uid=keystone,cn=users,cn=accounts,dc=cloud,dc=domain,dc=com
+ uid: keystone
+ password: password
Using LDAP backend for default domain
diff --git a/keystone/server.sls b/keystone/server.sls
index ad0ccf6..b29e39e 100644
--- a/keystone/server.sls
+++ b/keystone/server.sls
@@ -5,6 +5,14 @@
pkg.installed:
- names: {{ server.pkgs }}
+{%- if server.get('backend') == 'ldap' or server.get('domain',{}).itervalues() | selectattr('ldap') | list %}
+keystone_ldap_packages:
+ pkg.installed:
+ - names:
+ - python-ldap
+ - python-ldappool
+{% endif %}
+
{%- if server.service_name in ['apache2', 'httpd'] %}
{%- set keystone_service = 'apache_service' %}