opendev/system-config
Code Issues Proposed changes

Merge "Update OpenStackId puppet settings"

Browse Source
This commit is contained in:
Jenkins 2017-03-14 16:06:07 +00:00 committed by Gerrit Code Review
commit dda750f1e5
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/site.pp
View File

@ -1422,9 +1422,6 @@ node 'openstackid-dev.openstack.org' {
email_smtp_server => 'smtp.sendgrid.net', email_smtp_server => 'smtp.sendgrid.net',
email_smtp_server_user => hiera('openstackid_dev_smtp_user'), email_smtp_server_user => hiera('openstackid_dev_smtp_user'),
email_smtp_server_password => hiera('openstackid_dev_smtp_password'), email_smtp_server_password => hiera('openstackid_dev_smtp_password'),
laravel_version => 5,
app_log_level => 'debug',
curl_verify_ssl_cert => false,
} }
} }

10
modules/openstack_project/manifests/openstackid_dev.pp
View File

@ -46,14 +46,14 @@ class openstack_project::openstackid_dev (
$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 = '',
$laravel_version = 4, $laravel_version = 5,
$app_log_level = 'error', $app_log_level = 'debug',
$app_log_email_level = 'error', $app_log_email_level = 'debug',
$db_log_enabled = false, $db_log_enabled = false,
$banning_enabled = true, $banning_enabled = false,
$app_debug = false, $app_debug = false,
$app_locale = 'en', $app_locale = 'en',
$curl_verify_ssl_cert = true, $curl_verify_ssl_cert = false,
$curl_allow_redirect = false, $curl_allow_redirect = false,
$curl_timeout = 60, $curl_timeout = 60,
$assets_base_url = 'https://www.openstack.org/', $assets_base_url = 'https://www.openstack.org/',

18
modules/openstack_project/manifests/openstackid_prod.pp
View File

@ -35,11 +35,11 @@ class openstack_project::openstackid_prod (
$id_recaptcha_template = '', $id_recaptcha_template = '',
$id_log_error_to_email = '', $id_log_error_to_email = '',
$id_log_error_from_email = '', $id_log_error_from_email = '',
$id_environment = 'dev', $id_environment = 'production',
$ssl_cert_file_contents = '', $ssl_cert_file_contents = '',
$ssl_key_file_contents = '', $ssl_key_file_contents = '',
$ssl_chain_file_contents = '', $ssl_chain_file_contents = '',
$release = '1.0.19', $release = '1.0.20',
$app_url = '', $app_url = '',
$app_key = '', $app_key = '',
$email_driver = 'mail', $email_driver = 'mail',
@ -47,6 +47,20 @@ class openstack_project::openstackid_prod (
$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 = '',
$laravel_version = 5,
$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 ( realize (