diff --git a/Vagrantfile b/Vagrantfile index f2b016a1..10f8d99e 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -70,8 +70,8 @@ Vagrant.configure("2") do |config| override.vm.provision "shell", path: "provisioning/scripts/nomad_run.sh" end + # vmware fusion config.vm.provider "vmware_fusion" do |vmwf, override| - # Customize the amount of memory on the VM: override.vm.box = "generic/ubuntu1604" vmwf.memory = "2048" vmwf.cpus = 2 @@ -83,6 +83,20 @@ Vagrant.configure("2") do |config| end override.vm.provision "shell", path: "provisioning/scripts/nomad_run.sh" end + + # libvirt + config.vm.provider "libvirt" do |lv, override| + override.vm.box = "generic/ubuntu1604" + lv.memory = "2048" + lv.cpus = 2 + override.vm.provision :salt do |salt| + salt.minion_config = "provisioning/saltstack/etc/minion_libvirt.yml" + salt.run_highstate = true + salt.verbose = true + salt.salt_call_args = ["saltenv=dev", "pillarenv=dev"] + end + override.vm.provision "shell", path: "provisioning/scripts/nomad_run.sh" + end # # View the documentation for the provider you are using for more # information on available options. diff --git a/provisioning/saltstack/etc/minion_libvirt.yml b/provisioning/saltstack/etc/minion_libvirt.yml new file mode 100644 index 00000000..0829b5f4 --- /dev/null +++ b/provisioning/saltstack/etc/minion_libvirt.yml @@ -0,0 +1,20 @@ +file_client: local + +file_roots: + base: + - /vagrant/provisioning/saltstack/salt + dev: + - /vagrant/provisioning/saltstack/salt + - /vagrant/provisioning/saltstack/formulas/nomad-formula + - /vagrant/provisioning/saltstack/formulas/consul-formula + - /vagrant/provisioning/saltstack/formulas/docker-formula + - /vagrant/provisioning/saltstack/formulas/vault-formula + +pillar_roots: + base: + - /vagrant/provisioning/saltstack/pillar + dev: + - /vagrant/provisioning/saltstack/pillar + +grains: + provider: libvirt \ No newline at end of file diff --git a/provisioning/saltstack/pillar/dev/init.sls b/provisioning/saltstack/pillar/dev/init.sls index ff81d29e..be0cf6bb 100644 --- a/provisioning/saltstack/pillar/dev/init.sls +++ b/provisioning/saltstack/pillar/dev/init.sls @@ -16,6 +16,8 @@ nomad: network_interface: enp0s8 {% elif grains['provider'] == 'vmware' %} network_interface: eth1 + {% elif grains['provider'] == 'libvirt' %} + network_interface: eth0 {% endif %} enabled: true meta: