minor reorg

- move content to be served via gitfs to salt_content/gitfs
- create structure to hold local content at salt_content/local
- configure Vagrant to rsync salt_content/local to /srv on Salt master
This commit is contained in:
John Bowdre 2023-04-08 21:03:29 -05:00
parent 01a932185b
commit a58f8fcc1f
16 changed files with 8 additions and 5 deletions

13
Vagrantfile vendored
View file

@ -1,7 +1,7 @@
# -*- mode: ruby -*- # -*- mode: ruby -*-
# vi: set ft=ruby : # vi: set ft=ruby :
# Salt lab environment with one master and four minions # Salt lab environment with one master and various minions
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
config.nfs.verify_installed = false config.nfs.verify_installed = false
@ -13,7 +13,7 @@ Vagrant.configure("2") do |config|
salt.vm.provider :libvirt do |libvirt| salt.vm.provider :libvirt do |libvirt|
libvirt.memory = 1024 libvirt.memory = 1024
end end
# salt.vm.synced_folder 'srv', '/srv', type: 'rsync' salt.vm.synced_folder 'salt_content/local', '/srv', type: 'rsync'
salt.vm.provision "shell", inline: <<-SHELL salt.vm.provision "shell", inline: <<-SHELL
apt-get update apt-get update
apt-get install curl vim python3-pygit2 -y apt-get install curl vim python3-pygit2 -y
@ -23,7 +23,7 @@ Vagrant.configure("2") do |config|
auto_accept: True auto_accept: True
file_roots: file_roots:
base: base:
- /srv/ - /srv/salt
fileserver_backend: fileserver_backend:
- roots - roots
- gitfs - gitfs
@ -32,12 +32,15 @@ gitfs_update_interval: 60
gitfs_base: main gitfs_base: main
gitfs_remotes: gitfs_remotes:
- https://github.com/jbowdre/vagrant-saltlab.git: - https://github.com/jbowdre/vagrant-saltlab.git:
- root: salt_content/salt - root: salt_content/gitfs/salt
- mountpoint: salt:// - mountpoint: salt://
pillar_roots:
base:
- /srv/pillar
ext_pillar: ext_pillar:
- git: - git:
- main https://github.com/jbowdre/vagrant-saltlab.git: - main https://github.com/jbowdre/vagrant-saltlab.git:
- root: salt_content/pillar - root: salt_content/gitfs/pillar
- env: base - env: base
reactor: reactor:
- 'salt/minion/*/start': - 'salt/minion/*/start':

View file

View file

View file