From: Nicolas Iooss Date: Fri, 16 Oct 2015 21:34:01 +0000 (+0200) Subject: Working vagrant-salt configuration X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=0616782df828ee1966c8e28962c8a8bb80e17c98;p=vagrant-mail.git Working vagrant-salt configuration * One VM * Three packages * Debian Jessie --- diff --git a/.gitignore b/.gitignore index 9b1dffd..bcbb502 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.sqlite +.vagrant/ diff --git a/test-vagrant-salt/Vagrantfile b/test-vagrant-salt/Vagrantfile new file mode 100644 index 0000000..3565641 --- /dev/null +++ b/test-vagrant-salt/Vagrantfile @@ -0,0 +1,23 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +# All Vagrant configuration is done below. The "2" in Vagrant.configure +# configures the configuration version (we support older styles for +# backwards compatibility). Please don't change it unless you know what +# you're doing. +Vagrant.configure(2) do |config| + config.vm.box = "debian/jessie64" + config.vm.network "private_network", ip: "192.168.33.10" + config.vm.synced_folder "salt/", "/srv/salt" + + config.vm.provision :salt do |salt| + salt.minion_config = "saltconfig" + salt.install_type = "stable" + #salt.run_highstate = true + salt.masterless = true + salt.verbose = true + salt.colorize = true + # https://github.com/mitchellh/vagrant/issues/5973#issuecomment-137276605 + salt.bootstrap_options = "-F -c /tmp/ -P" + end +end diff --git a/test-vagrant-salt/salt/common/init.sls b/test-vagrant-salt/salt/common/init.sls new file mode 100644 index 0000000..9a5c88a --- /dev/null +++ b/test-vagrant-salt/salt/common/init.sls @@ -0,0 +1,2 @@ +include: + - common.packages \ No newline at end of file diff --git a/test-vagrant-salt/salt/common/packages.sls b/test-vagrant-salt/salt/common/packages.sls new file mode 100644 index 0000000..86bc704 --- /dev/null +++ b/test-vagrant-salt/salt/common/packages.sls @@ -0,0 +1,6 @@ +common_packages: + pkg.installed: + - pkgs: + - htop + - strace + - vim diff --git a/test-vagrant-salt/salt/top.sls b/test-vagrant-salt/salt/top.sls new file mode 100644 index 0000000..133c807 --- /dev/null +++ b/test-vagrant-salt/salt/top.sls @@ -0,0 +1,3 @@ +base: + '*': + - common diff --git a/test-vagrant-salt/saltconfig b/test-vagrant-salt/saltconfig new file mode 100644 index 0000000..2e0c5b0 --- /dev/null +++ b/test-vagrant-salt/saltconfig @@ -0,0 +1,4 @@ +id: masterless-salt + +# Do not fetch resources from a master +file_client: local