diff --git a/config.yaml.sample b/config.yaml.sample
index a32a262..4114ab3 100644
--- a/config.yaml.sample
+++ b/config.yaml.sample
@@ -20,6 +20,13 @@ bridge_int: eth1
 #box_name: 'my.favorite'
 #box_url: http://gallifrey/vagrant/devstack-2014-02-19.box
 
+# The password that should be used for services like the database
+# or queuing.
+service_password: pass
+
+# The password that should be used for the admin user
+admin_password: pass
+
 # Local devstack options
 # a non upstream git url to fetch devstack from instead
 #devstack_git: /home/vagrant/openstack/devstack
diff --git a/puppet/modules/devstack/templates/local.erb b/puppet/modules/devstack/templates/local.erb
index 196494f..ead880e 100644
--- a/puppet/modules/devstack/templates/local.erb
+++ b/puppet/modules/devstack/templates/local.erb
@@ -2,11 +2,11 @@
 
 # generic configuration parameters
 
-DATABASE_PASSWORD=pass
-RABBIT_PASSWORD=pass
-SERVICE_TOKEN=pass
-SERVICE_PASSWORD=pass
-ADMIN_PASSWORD=pass
+DATABASE_PASSWORD=<%= @service_password %>
+RABBIT_PASSWORD=<%= @service_password %>
+SERVICE_TOKEN=<%= @service_password %>
+SERVICE_PASSWORD=<%= @service_password %>
+ADMIN_PASSWORD=<%= @admin_password %>
 
 MULTI_HOST="True"
 API_RATE_LIMIT="False"
@@ -58,7 +58,7 @@ CEILOMETER_BACKEND=mongodb
 <% if @use_ldap == "true" %>
 # LDAP configuration parameters (manager)
 
-LDAP_PASSWORD=pass
+LDAP_PASSWORD=<%= @service_password %>
 enable_service ldap
 <% end %>