From b42315d733880d21ffb500c5f19a610d1e8534f0 Mon Sep 17 00:00:00 2001
From: Sebastian Marcet <smarcet@gmail.com>
Date: Fri, 10 Mar 2017 12:06:20 -0300
Subject: [PATCH] Update OpenStackId puppet settings

updated production node to deploy version
1.0.20 and to use LV 5 script

update dev node to use LV5 as default and
removed from site.pp

Change-Id: I8d4cee26096f026fb9c251c0d76fb6a1447aa0ca
---
 manifests/site.pp                              |  3 ---
 .../manifests/openstackid_dev.pp               | 10 +++++-----
 .../manifests/openstackid_prod.pp              | 18 ++++++++++++++++--
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 46ee93a1bb..3900c658d5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1421,9 +1421,6 @@ 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 b7cd746955..8de403c7f8 100644
--- a/modules/openstack_project/manifests/openstackid_dev.pp
+++ b/modules/openstack_project/manifests/openstackid_dev.pp
@@ -46,14 +46,14 @@ 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',
+  $laravel_version = 5,
+  $app_log_level = 'debug',
+  $app_log_email_level = 'debug',
   $db_log_enabled = false,
-  $banning_enabled = true,
+  $banning_enabled = false,
   $app_debug = false,
   $app_locale = 'en',
-  $curl_verify_ssl_cert = true,
+  $curl_verify_ssl_cert = false,
   $curl_allow_redirect = false,
   $curl_timeout = 60,
   $assets_base_url = 'https://www.openstack.org/',
diff --git a/modules/openstack_project/manifests/openstackid_prod.pp b/modules/openstack_project/manifests/openstackid_prod.pp
index d6c485b972..250609de17 100644
--- a/modules/openstack_project/manifests/openstackid_prod.pp
+++ b/modules/openstack_project/manifests/openstackid_prod.pp
@@ -35,11 +35,11 @@ class openstack_project::openstackid_prod (
   $id_recaptcha_template = '',
   $id_log_error_to_email = '',
   $id_log_error_from_email = '',
-  $id_environment = 'dev',
+  $id_environment = 'production',
   $ssl_cert_file_contents = '',
   $ssl_key_file_contents = '',
   $ssl_chain_file_contents = '',
-  $release = '1.0.19',
+  $release = '1.0.20',
   $app_url = '',
   $app_key = '',
   $email_driver = 'mail',
@@ -47,6 +47,20 @@ class openstack_project::openstackid_prod (
   $email_smtp_server_port = 587,
   $email_smtp_server_user = '',
   $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 (