dev/modules/sysconfig/manifests/params.pp
changeset 136 66972b143124
parent 129 3a7a8607d395
--- a/dev/modules/sysconfig/manifests/params.pp	Wed Sep 10 16:41:33 2014 +0200
+++ b/dev/modules/sysconfig/manifests/params.pp	Fri Sep 12 15:28:17 2014 +0200
@@ -1,24 +1,18 @@
 class sysconfig::params {
 
-  $db_name = 'spel'
-  $db_user = 'spel_user'
-  $db_pw   = 'spel'
-  $db_host = '127.0.0.1'
-  $db_port = '5432'
+  $db_name = hiera('sysconfig::params::db_name','spel')
+  $db_user = hiera('sysconfig::params::db_user','spel_user')
+  $db_pw   = hiera('sysconfig::params::db_pw','spel')
+  $db_host = hiera('sysconfig::params::db_host','127.0.0.1')
+  $db_port = hiera('sysconfig::params::db_port','5432')
 
-  $db_host_real = hiera('sysconfig::params::db_host',$db_host)
+  $db_host_real = $db_host
   $db_is_local = ($db_host_real == undef or !$db_host_real or $db_host_real=='127.0.0.1' or $db_host_real=='localhost')
 
-  $testserver_port = 8001
+  $testserver_port = hiera('sysconfig::params::testserver_port','8001')
 
-  $superuser_name   = 'admin'
-  $superuser_pw     = 'dev@spel'
-  $user_edit_name   = 'user-edit'
-  $user_edit_pw     = 'user-edit@spel'
-  $user_com_name    = 'user-com'
-  $user_com_pw      = 'user-com@spel'
-  $user_observ_name = 'user-observ'
-  $user_observ_pw   = 'user-observ@spel'
+  $superuser_name   = hiera('sysconfig::params::superuser_name','admin')
+  $superuser_pw     = hiera('sysconfig::params::superuser_pw','dev@spel')
   
   $path_to_virtualenv = hiera('sysconfig::params::path_to_virtualenv', '/home/vagrant/myspelenv')