openstack
/
devstack-vagrant
Code Issues Proposed changes

Merge "Make the used passwords configurable"

This commit is contained in:
Jenkins 2014-10-30 18:51:05 +00:00 committed by Gerrit Code Review
parent e6720b9f84 93cb2899ae
commit e229dfc580
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config.yaml.sample
View File

@ -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

12
puppet/modules/devstack/templates/local.erb
View File

@ -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 %>