Merge "Add new reclass config options into salt formula - overrides"

salt/files/master.conf

@@ -95,12 +95,28 @@ reclass: &reclass
   {%- endif %}
   {%- if master.pillar.reclass.get('propagate_pillar_data_to_reclass', False) == True %}
   propagate_pillar_data_to_reclass: {{ master.pillar.reclass.propagate_pillar_data_to_reclass }}
-  {%- endif %}
+  {%- endif %} 
+  # Below options are not available in original reclass,
+  # use fork with extensions from https://github.com/salt-formulas/reclass
   {%- if master.pillar.reclass.get('ignore_class_notfound', False) == True %}
-  # Below option is not available in upstream reclass, and require fork https://github.com/salt-formulas/reclass
   ignore_class_notfound: {{ master.pillar.reclass.ignore_class_notfound }}
   ignore_class_regexp: {{ master.pillar.reclass.ignore_class_regexp }}
   {%- endif %}
+  {%- if master.pillar.reclass.allow_scalar_over_dict is defined %}
+  allow_scalar_over_dict: {{ master.pillar.reclass.allow_scalar_over_dict }}
+  {%- endif %}
+  {%- if master.pillar.reclass.allow_scalar_over_list is defined %}
+  allow_scalar_over_list: {{ master.pillar.reclass.allow_scalar_over_list }}
+  {%- endif %}
+  {%- if master.pillar.reclass.allow_list_over_scalar is defined %}
+  allow_list_over_scalar: {{ master.pillar.reclass.allow_list_over_scalar }}
+  {%- endif %}
+  {%- if master.pillar.reclass.allow_dict_over_scalar is defined %}
+  allow_dict_over_scalar: {{ master.pillar.reclass.allow_dict_over_scalar }}
+  {%- endif %}
+  {%- if master.pillar.reclass.allow_none_override is defined %}
+  allow_none_override: {{ master.pillar.reclass.allow_none_override }}
+  {%- endif %}
   {%- endif %}
 {%- endif %}