Hiera 5 migration

diff --git a/manifests/init.pp b/manifests/init.pp
index 90b13424e7fb820da8c19fb6a8c4d5f2ae10e7c3..934601d474eb0eb4dd2c1ed805f3ac9f1e3b3e7b 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -27,23 +27,23 @@ class database {
 
   # Avoid Errcode: 24
   database::config { 'open-files-limit':
 
   # Avoid Errcode: 24
   database::config { 'open-files-limit':

-    value => hiera('database::open-files-limit', '500000'),
+    value => lookup('database::open-files-limit', undef, undef, '500000'),

   }
 
   database::config {
   }
 
   database::config {

-    'query_cache_size':        value => hiera('database::query_cache_size',        '64M');
-    'query_cache_limit':       value => hiera('database::query_cache_limit',       '2M');
-    'join_buffer_size':        value => hiera('database::join_buffer_size',        '256K');
-    'key_buffer_size':         value => hiera('database::key_buffer_size',         '32M');
-    'tmp_table_size':          value => hiera('database::tmp_table_size',          '64M');
-    'max_heap_table_size':     value => hiera('database::max_heap_table_size',     '64M');
-    'innodb_buffer_pool_size': value => hiera('database::innodb_buffer_pool_size', '256M');
-    'table_open_cache':        value => hiera('database::table_open_cache',        '800');
+    'query_cache_size':        value => lookup('database::query_cache_size', undef, undef,        '64M');
+    'query_cache_limit':       value => lookup('database::query_cache_limit', undef, undef,       '2M');
+    'join_buffer_size':        value => lookup('database::join_buffer_size', undef, undef,        '256K');
+    'key_buffer_size':         value => lookup('database::key_buffer_size', undef, undef,         '32M');
+    'tmp_table_size':          value => lookup('database::tmp_table_size', undef, undef,          '64M');
+    'max_heap_table_size':     value => lookup('database::max_heap_table_size', undef, undef,     '64M');
+    'innodb_buffer_pool_size': value => lookup('database::innodb_buffer_pool_size', undef, undef, '256M');
+    'table_open_cache':        value => lookup('database::table_open_cache', undef, undef,        '800');

   }
 
   # Renamed to table_open_cache
   database::config { 'table_cache':
   }
 
   # Renamed to table_open_cache
   database::config { 'table_cache':

-    value  => hiera('database::table_cache', '800'),
+    value  => lookup('database::table_cache', undef, undef, '800'),

     ensure => absent,
   }
 }
     ensure => absent,
   }
 }