Preparing new release

Author: alvagante

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.10.2
+
+- Fixed options param in tp::conf where use_v4 is false
+
 ## 3.10.1
 
 -   Changed CI containers used

manifests/conf.pp

@@ -445,7 +445,7 @@
     $settings = $tp_settings + $settings_hash
 
     $tp_options = tp_lookup($app,"options::${base_file}",$data_module,'merge')
-    $options = $tp_options + $options_hash
+    $options = deep_merge($tp_options,$options_hash,$my_options,)
 
     if $file and $file != '' {
       $prefix = $scope ? {
@@ -489,7 +489,7 @@
 
     # If user doesn't provide a $content, $template or $epp but provides $options_hash we check
     # if on tinydata is set config_file_format
-    if $content_params =~ Undef and $settings[config_file_format] and $options_hash != {} {
+    if $content_params =~ Undef and $settings[config_file_format] and $options != {} {
       $manage_content = $settings[config_file_format] ? {
         'yaml' => to_yaml($options_hash),
         'json' => to_json($options_hash),

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "example42-tp",
-  "version": "3.10.1",
+  "version": "3.10.2",
   "author": "example42",
   "summary": "Tiny Puppet",
   "license": "Apache-2.0",