Allow none override + cleanup
Related-Bug: PROD-21498 (PROD:21498)
Change-Id: If14e1e335818b802d163c4178b46ab8e226dc892
diff --git a/reclass/storage/salt.yml b/reclass/storage/salt.yml
index 0a21cdb..b2025c4 100644
--- a/reclass/storage/salt.yml
+++ b/reclass/storage/salt.yml
@@ -8,6 +8,8 @@
engine: git
address: '${_param:reclass_data_repository}'
branch: ${_param:reclass_data_revision}
+
+ # TODO, remove this once not required for backward compatibility
salt:
master:
pillar:
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
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