Different configuration parameters were introduced with theldap_fluff patchset. --- recipes/aeolus/templates/conductor-settings.yml | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/recipes/aeolus/templates/conductor-settings.yml b/recipes/aeolus/templates/conductor-settings.yml index dec51d3..91fc83b 100644 --- a/recipes/aeolus/templates/conductor-settings.yml +++ b/recipes/aeolus/templates/conductor-settings.yml @@ -3,13 +3,11 @@ :auth: # supported strategies: database, ldap :strategy: database - :ldap: - :host: localhost - # '%s' expression in username_dn string will be replaced - # by user's login - # username_dn: "deltacloud\%s" - :username_dn: uid=%s,ou=People,dc=my-domain,dc=com - # :port: 389 +:groups: + # allows locally-managed groups + :enable_local: true + # allows ldap-managed groups + :enable_ldap: true :iwhd: :url: http://localhost:9090 :oauth: -- 1.7.7.6
