From f67665858b64454b9ed92508e60a767a2478ccfa Mon Sep 17 00:00:00 2001
From: John Bowdre <john@bowdre.net>
Date: Fri, 7 Apr 2023 22:38:21 -0500
Subject: [PATCH] update config to pull salt content from repo using gitfs

---
 Vagrantfile                                   | 27 +++++++++++++------
 {srv => salt_content}/pillar/pkg/init.sls     |  0
 {srv => salt_content}/pillar/top.sls          |  0
 {srv => salt_content}/pillar/users/init.sls   |  0
 .../salt/_reactor}/sync_grains.sls            |  0
 {srv => salt_content}/salt/top.sls            |  0
 {srv => salt_content}/salt/users/init.sls     |  0
 {srv => salt_content}/salt/vim/init.sls       |  0
 {srv => salt_content}/salt/vim/uninstall.sls  |  0
 {srv => salt_content}/salt/vim/vimrc          |  0
 .../salt/webserver/index.html                 |  0
 {srv => salt_content}/salt/webserver/init.sls |  0
 .../salt/webserver/uninstall.sls              |  0
 13 files changed, 19 insertions(+), 8 deletions(-)
 rename {srv => salt_content}/pillar/pkg/init.sls (100%)
 rename {srv => salt_content}/pillar/top.sls (100%)
 rename {srv => salt_content}/pillar/users/init.sls (100%)
 rename {srv/reactor => salt_content/salt/_reactor}/sync_grains.sls (100%)
 rename {srv => salt_content}/salt/top.sls (100%)
 rename {srv => salt_content}/salt/users/init.sls (100%)
 rename {srv => salt_content}/salt/vim/init.sls (100%)
 rename {srv => salt_content}/salt/vim/uninstall.sls (100%)
 rename {srv => salt_content}/salt/vim/vimrc (100%)
 rename {srv => salt_content}/salt/webserver/index.html (100%)
 rename {srv => salt_content}/salt/webserver/init.sls (100%)
 rename {srv => salt_content}/salt/webserver/uninstall.sls (100%)

diff --git a/Vagrantfile b/Vagrantfile
index 4239582..f185e7b 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -13,23 +13,34 @@ Vagrant.configure("2") do |config|
     salt.vm.provider :libvirt do |libvirt|
       libvirt.memory = 1024
     end
-    salt.vm.synced_folder 'srv', '/srv', type: 'rsync'
+    # salt.vm.synced_folder 'srv', '/srv', type: 'rsync'
     salt.vm.provision "shell", inline: <<-SHELL
       apt-get update
-      apt-get install curl vim -y
+      apt-get install curl vim python3-pygit2 -y
       curl -o bootstrap-salt.sh -L https://bootstrap.saltproject.io
       sh bootstrap-salt.sh -M -X -U
       cat << EOF > /etc/salt/master.d/lab.conf
-auto_accept: True
+auto_accept:
 file_roots:
   base:
-    - /srv/salt
-pillar_roots:
-  base:
-    - /srv/pillar
+    - /srv/
+fileserver_backend:
+  - roots
+  - gitfs
+gitfs_provider: pygit2
+gitfs_update_interval: 60
+gitfs_base: main
+gitfs_remotes:
+  - https://github.com/jbowdre/vagrant-saltlab.git:
+    - root: salt_content/salt
+    - mountpoint: salt://
+ext_pillar:
+  - git:
+    - main https://github.com/jbowdre/vagrant-saltlab.git:
+      - root: pillar
 reactor:
   - 'salt/minion/*/start':
-    - /srv/reactor/sync_grains.sls
+    - salt://_reactor/sync_grains.sls
 EOF
       systemctl start salt-master
       systemctl start salt-minion
diff --git a/srv/pillar/pkg/init.sls b/salt_content/pillar/pkg/init.sls
similarity index 100%
rename from srv/pillar/pkg/init.sls
rename to salt_content/pillar/pkg/init.sls
diff --git a/srv/pillar/top.sls b/salt_content/pillar/top.sls
similarity index 100%
rename from srv/pillar/top.sls
rename to salt_content/pillar/top.sls
diff --git a/srv/pillar/users/init.sls b/salt_content/pillar/users/init.sls
similarity index 100%
rename from srv/pillar/users/init.sls
rename to salt_content/pillar/users/init.sls
diff --git a/srv/reactor/sync_grains.sls b/salt_content/salt/_reactor/sync_grains.sls
similarity index 100%
rename from srv/reactor/sync_grains.sls
rename to salt_content/salt/_reactor/sync_grains.sls
diff --git a/srv/salt/top.sls b/salt_content/salt/top.sls
similarity index 100%
rename from srv/salt/top.sls
rename to salt_content/salt/top.sls
diff --git a/srv/salt/users/init.sls b/salt_content/salt/users/init.sls
similarity index 100%
rename from srv/salt/users/init.sls
rename to salt_content/salt/users/init.sls
diff --git a/srv/salt/vim/init.sls b/salt_content/salt/vim/init.sls
similarity index 100%
rename from srv/salt/vim/init.sls
rename to salt_content/salt/vim/init.sls
diff --git a/srv/salt/vim/uninstall.sls b/salt_content/salt/vim/uninstall.sls
similarity index 100%
rename from srv/salt/vim/uninstall.sls
rename to salt_content/salt/vim/uninstall.sls
diff --git a/srv/salt/vim/vimrc b/salt_content/salt/vim/vimrc
similarity index 100%
rename from srv/salt/vim/vimrc
rename to salt_content/salt/vim/vimrc
diff --git a/srv/salt/webserver/index.html b/salt_content/salt/webserver/index.html
similarity index 100%
rename from srv/salt/webserver/index.html
rename to salt_content/salt/webserver/index.html
diff --git a/srv/salt/webserver/init.sls b/salt_content/salt/webserver/init.sls
similarity index 100%
rename from srv/salt/webserver/init.sls
rename to salt_content/salt/webserver/init.sls
diff --git a/srv/salt/webserver/uninstall.sls b/salt_content/salt/webserver/uninstall.sls
similarity index 100%
rename from srv/salt/webserver/uninstall.sls
rename to salt_content/salt/webserver/uninstall.sls