From 2c0f542ba311a3d8b36979060312111fcdcd6f91 Mon Sep 17 00:00:00 2001 From: Sebastian Marcet Date: Tue, 29 Nov 2016 13:43:27 -0300 Subject: [PATCH] Updated OpenstackId Dev configuration to use LV 5.x updated puppet settings for https://openstackid-dev.openstack.org/ in order to start using LV 5.x https://review.openstack.org/#/c/305521/ Change-Id: I809aa5bb4357ce7014b27497db2f4feb7952c9db --- manifests/site.pp | 3 ++ .../manifests/openstackid_dev.pp | 28 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/manifests/site.pp b/manifests/site.pp index d04fd47ad5..cd9c4eea69 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1246,6 +1246,9 @@ node 'openstackid-dev.openstack.org' { email_smtp_server => 'smtp.sendgrid.net', email_smtp_server_user => hiera('openstackid_dev_smtp_user'), email_smtp_server_password => hiera('openstackid_dev_smtp_password'), + laravel_version => 5, + app_log_level => 'debug', + curl_verify_ssl_cert => false, } } diff --git a/modules/openstack_project/manifests/openstackid_dev.pp b/modules/openstack_project/manifests/openstackid_dev.pp index a27a5ba03a..b7cd746955 100644 --- a/modules/openstack_project/manifests/openstackid_dev.pp +++ b/modules/openstack_project/manifests/openstackid_dev.pp @@ -46,6 +46,20 @@ class openstack_project::openstackid_dev ( $email_smtp_server_port = 587, $email_smtp_server_user = '', $email_smtp_server_password = '', + $laravel_version = 4, + $app_log_level = 'error', + $app_log_email_level = 'error', + $db_log_enabled = false, + $banning_enabled = true, + $app_debug = false, + $app_locale = 'en', + $curl_verify_ssl_cert = true, + $curl_allow_redirect = false, + $curl_timeout = 60, + $assets_base_url = 'https://www.openstack.org/', + $cache_driver = 'redis', + $session_driver = 'redis', + $session_cookie_secure = false, ) { realize ( @@ -90,6 +104,20 @@ class openstack_project::openstackid_dev ( email_smtp_server_port => $email_smtp_server_port, email_smtp_server_user => $email_smtp_server_user, email_smtp_server_password => $email_smtp_server_password, + laravel_version => $laravel_version, + app_log_level => $app_log_level, + app_log_email_level => $app_log_email_level, + db_log_enabled => $db_log_enabled, + banning_enabled => $banning_enabled, + app_debug => $app_debug, + app_locale => $app_locale, + curl_verify_ssl_cert => $curl_verify_ssl_cert, + curl_allow_redirect => $curl_allow_redirect, + curl_timeout => $curl_timeout, + assets_base_url => $assets_base_url, + cache_driver => $cache_driver, + session_driver => $session_driver, + session_cookie_secure => $session_cookie_secure, } # redis (custom module written by tipit)