Merge branch 'master' into develop

cern-it-sdc-id · Nov 13, 2018 · 4309131 · 4309131
2 parents 45281a0 + 1818ce3
commit 4309131
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 24 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2018-06-04 Andrea Manzi  <[email protected]>
+    * added changes for DPM 1.10.0
 2018-02-21 Andrea Sartirana  <[email protected]>
     * Modification needed for new cms federation config
 2018-01-15 Andrea Manzi  <[email protected]>

diff --git a/manifests/dome/config.pp b/manifests/dome/config.pp
@@ -5,8 +5,8 @@
   $disk_debug         = $dmlite::dome::params::disk_debug,
   $head_maxfilepulls   = $dmlite::dome::params::head_maxfilepulls,
   $head_maxfilepullspernode = $dmlite::dome::params::head_maxfilepullspernode,
-  $head_maxchecksums  = $dmlite::dome::params::head_maxchecksums,
-  $head_maxchecksumspernode  = $dmlite::dome::params::head_maxchecksumspernode,
+  $head_checksum_maxtotal = $dmlite::dome::params::head_checksum_maxtotal,
+  $head_checksum_maxpernode = $dmlite::dome::params::head_checksum_maxpernode,
   $db_host            = $dmlite::dome::params::db_host,
   $db_user	      = $dmlite::dome::params::db_user,
   $db_password	      = undef,

diff --git a/manifests/dome/params.pp b/manifests/dome/params.pp
@@ -6,8 +6,8 @@
     $disk_debug 	= hiera('dmlite::dome::params::disk_debug', 1)
     $head_maxfilepulls   = hiera('dmlite::dome::params::head_maxfilepulls', 4)
     $head_maxfilepullspernode =  hiera('dmlite::dome::params::head_maxfilepullspernode', 2)
-    $head_maxchecksums  = hiera('dmlite::dome::params::head_maxchecksums', 200)
-    $head_maxchecksumspernode  = hiera('dmlite::dome::params::head_maxchecksumspernode', 100)
+    $head_checksum_maxtotal = hiera('dmlite::dome::params::head_checksum_maxtotal', 200)
+    $head_checksum_maxpernode = hiera('dmlite::dome::params::head_checksum_maxpernode', 100)
     $db_host 		= hiera('dmlite::dome::params::db_host', 'localhost')
     $db_user  		= hiera('dmlite::dome::params::db_user', 'dpmmgr')
     $db_password	= undef

diff --git a/templates/dome/dome.conf.in b/templates/dome/dome.conf.in
diff --git a/templates/dome/domehead.conf.erb b/templates/dome/domehead.conf.erb
@@ -26,9 +26,9 @@ head.filepulls.maxtotal: <%= @head_maxfilepulls -%>
 
 head.filepulls.maxpernode: <%= @head_maxfilepullspernode -%>
 
-head.maxchecksums: <%= @head_maxchecksums -%>
+head.checksum.maxtotal: <%= @head_checksum_maxtotal -%>
 
-head.maxchecksumspernode:  <%= @head_maxchecksumspernode -%>
+head.checksum.maxpernode: <%= @head_checksum_maxpernode -%>
 
 head.filepuller.stathook: <%= @head_filepuller_stathook -%>