opendev
/
puppet-openstackid
Code Issues Proposed changes

Merge "Added DB seeding support"

This commit is contained in:
Jenkins 2016-03-22 14:14:23 +00:00 committed by Gerrit Code Review
parent a9fd2fa4fd 79e17cabef
commit afe80004cc
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/functions
View File

@ -68,7 +68,9 @@ function site_init {
# populate application database # populate application database
cd $target_dir cd $target_dir
php artisan migrate --env=$LARAVEL_ENV php artisan migrate --env=$LARAVEL_ENV
php artisan db:seed --env=$LARAVEL_ENV if [[ $USE_DB_SEEDING -eq 1 ]]; then
php artisan db:seed --env=$LARAVEL_ENV
fi
update_node update_node
install_bower install_bower
# activate site # activate site

1
manifests/init.pp
View File

@ -60,6 +60,7 @@ class openstackid (
$email_smtp_server_port = 587, $email_smtp_server_port = 587,
$email_smtp_server_user = '', $email_smtp_server_user = '',
$email_smtp_server_password = '', $email_smtp_server_password = '',
$use_db_seeding = false,
) { ) {
# php packages needed for openid server # php packages needed for openid server

5
templates/openstackid.conf.erb
View File

@ -1,5 +1,6 @@
SITE_ROOT=/srv/openstackid SITE_ROOT=/srv/openstackid
SOURCE_TARBALL=http://tarballs.openstack.org/openstackid/openstackid-<%= @openstackid_release %>.tar.gz SOURCE_TARBALL=http://tarballs.openstack.org/openstackid/openstackid-<%= @openstackid_release %>.tar.gz
LARAVEL_ENV=dev LARAVEL_ENV=<%= @id_environment %>
RELEASE_NAME=openstackid-<%= @openstackid_release %>.tar.gz RELEASE_NAME=openstackid-<%= @openstackid_release %>.tar.gz
SOURCE_ROOT=http://tarballs.openstack.org/openstackid/ SOURCE_ROOT=http://tarballs.openstack.org/openstackid/
USE_DB_SEEDING=<%= @use_db_seeding?1:0 %>