From 79e17cabef0d6e727c95f269a1b94dbc3413764f Mon Sep 17 00:00:00 2001 From: Sebastian Marcet Date: Mon, 21 Mar 2016 20:41:20 -0300 Subject: [PATCH] Added DB seeding support added db seeding support configuration on install site command by default is disabled to avoid overwriten existent db Change-Id: Iba74a5f6f8a08f73d73bc0ca2d499ea215cf8c8a --- files/functions | 4 +++- manifests/init.pp | 1 + templates/openstackid.conf.erb | 5 +++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/files/functions b/files/functions index 7712947..ed21d36 100644 --- a/files/functions +++ b/files/functions @@ -68,7 +68,9 @@ function site_init { # populate application database cd $target_dir 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 install_bower # activate site diff --git a/manifests/init.pp b/manifests/init.pp index aad7d40..1741bee 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -60,6 +60,7 @@ class openstackid ( $email_smtp_server_port = 587, $email_smtp_server_user = '', $email_smtp_server_password = '', + $use_db_seeding = false, ) { # php packages needed for openid server diff --git a/templates/openstackid.conf.erb b/templates/openstackid.conf.erb index 9fc6958..fa877f0 100644 --- a/templates/openstackid.conf.erb +++ b/templates/openstackid.conf.erb @@ -1,5 +1,6 @@ SITE_ROOT=/srv/openstackid 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 -SOURCE_ROOT=http://tarballs.openstack.org/openstackid/ \ No newline at end of file +SOURCE_ROOT=http://tarballs.openstack.org/openstackid/ +USE_DB_SEEDING=<%= @use_db_seeding?1:0 %> \ No newline at end of file