feat(tofs): allow TOFS for master configuration

myii · myii · commit 1b202afb2903 · 2019-06-07T03:58:24.000+01:00
diff --git a/pillar.example b/pillar.example
@@ -64,9 +64,12 @@ salt:
   #   dirs:
   #     files: files_alt
   #     default: default_alt
-  #   source_files: {}
+  #   source_files:
+  #     salt-master:
+  #       - 'alt_master.d'
 
   # salt master config
+  master_config_use_TOFS: True
   master:
     fileserver_backend:
       - git
diff --git a/salt/defaults.yaml b/salt/defaults.yaml
@@ -10,6 +10,7 @@ salt:
 
   minion_remove_config: False
   master_remove_config: False
+  master_config_use_TOFS: False
 
   minion_service: salt-minion
   master_service: salt-master
diff --git a/salt/files/default/master.d/engine.conf b/salt/files/default/master.d/engine.conf
@@ -0,0 +1,4 @@
+########################################################################
+## File managed by Salt.
+## Your changes will be overwritten.
+########################################################################
diff --git a/salt/files/default/master.d/f_defaults.conf b/salt/files/default/master.d/f_defaults.conf
@@ -0,0 +1,4 @@
+########################################################################
+## File managed by Salt.
+## Your changes will be overwritten.
+########################################################################
diff --git a/salt/files/default/master.d/lxc_profiles.conf b/salt/files/default/master.d/lxc_profiles.conf
@@ -0,0 +1,4 @@
+########################################################################
+## File managed by Salt.
+## Your changes will be overwritten.
+########################################################################
diff --git a/salt/files/default/master.d/reactor.conf b/salt/files/default/master.d/reactor.conf
@@ -0,0 +1,4 @@
+########################################################################
+## File managed by Salt.
+## Your changes will be overwritten.
+########################################################################
diff --git a/salt/master.sls b/salt/master.sls
@@ -1,4 +1,6 @@
-{% from "salt/map.jinja" import salt_settings with context %}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- from tplroot ~ "/map.jinja" import salt_settings with context %}
+{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
 
 salt-master:
 {% if salt_settings.install_packages %}
@@ -14,8 +16,16 @@ salt-master:
 {% endif %}
   file.recurse:
     - name: {{ salt_settings.config_path }}/master.d
+    {%- if salt_settings.master_config_use_TOFS %}
+    - template: ''
+    - source: {{ files_switch(['master.d'],
+                              lookup='salt-master'
+                 )
+              }}
+    {%- else %}
     - template: jinja
     - source: salt://{{ slspath }}/files/master.d
+    {%- endif %}
     - clean: {{ salt_settings.clean_config_d_dir }}
     - exclude_pat: _*
   service.running:
