commit bb512d6280091f663f30d87c445f874251995b4c
author Petr Michalec <pmichalec@mirantis.com> Fri Aug 10 11:13:19 2018 +0200
committer Petr Michalec <pmichalec@mirantis.com> Wed Sep 19 17:17:52 2018 +0200
tree 736911fcff14df0f40ae3cdbc010d438af86f85a
parent 7d40f1cff019b50cdf27a9a7255a552dbbef6ea6

Allow none override + cleanup

Related-Bug: PROD-21498 (PROD:21498)

Change-Id: If14e1e335818b802d163c4178b46ab8e226dc892

salt/master/pillar/composite/reclass.yml

diff --git a/salt/master/pillar/composite/reclass.yml b/salt/master/pillar/composite/reclass.yml
index 0b5443b..601f3bf 100644
--- a/salt/master/pillar/composite/reclass.yml
+++ b/salt/master/pillar/composite/reclass.yml
@@ -1,2 +1,15 @@
 classes:
 - service.salt.master.pillar.composite.reclass
+
+parameters:
+  salt:
+    master:
+      pillar:
+        reclass:
+          allow_none_override: True
+
+  # NOTE, it's not good practice to combine formula pillars here
+  # exception: in this case is required to sync the same options
+  reclass:
+    storage:
+      allow_none_override: True

salt/master/pillar/reclass.yml

diff --git a/salt/master/pillar/reclass.yml b/salt/master/pillar/reclass.yml
index cfeca33..8b88bf4 100644
--- a/salt/master/pillar/reclass.yml
+++ b/salt/master/pillar/reclass.yml
@@ -1,2 +1,9 @@
 classes:
 - service.salt.master.pillar.reclass
+
+parameters:
+  salt:
+    master:
+      pillar:
+        engine: reclass
+        data_dir: /srv/salt/reclass