Merge "Add suport for LDAP"

Vagrantfile

@@ -44,6 +44,7 @@ def configure_vm(name, vm, conf)
       ## tells default.pp that we're running in Vagrant
       "is_vagrant" => true,
       "is_compute" => (name != "manager"),
+      "use_ldap" => conf["use_ldap"] || false,
     }
     # add all the rest of the content in the conf file
     conf.each do |k, v|

config.yaml.sample

@@ -26,6 +26,10 @@ bridge_int: eth1
 # if you have code on a different branch than master, you can set it here
 #devstack_branch: compute_err_exit
 
+# Uncomment below to setup LDAP on the management node and use it as
+# backend for keystone
+#use_ldap: true
+
 # You can specify stable mac addresses to keep this from resetting
 # on every create
 # mac_address_manager: 0800274a508c

puppet/modules/devstack/templates/local.erb

@@ -35,6 +35,11 @@ enable_service dstat
 enable_service ceilometer-acompute ceilometer-acentral ceilometer-anotification ceilometer-collector ceilometer-api
 enable_service ceilometer-alarm-notifier ceilometer-alarm-evaluator
 
+<% if @use_ldap == "true" %>
+LDAP_PASSWORD=pass
+enable_service ldap
+<% end %>
+
 <% end %>
 
 [[post-config|$NOVA_CONF]]