diff --git a/.gitignore b/.gitignore index f7834ce..6442824 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /.project *.swp +.vagrant diff --git a/README.rst b/README.rst index bb05bf7..f01b868 100644 --- a/README.rst +++ b/README.rst @@ -385,8 +385,6 @@ Ubuntu box. First, install Vagrant, then:: $ vagrant up $ vagrant ssh - $ cd /salt_bootstrap - $ sudo sh salt-bootstrap.sh .. _Vagrant: http://www.vagrantup.com diff --git a/Vagrantfile b/Vagrantfile index 94166f9..64c2213 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -10,7 +10,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # please see the online documentation at vagrantup.com. # Every Vagrant virtual environment requires a box to build off of. - config.vm.box = "precise64" + config.vm.box = "ubuntu/precise64" # The url from where the 'config.vm.box' box will be fetched if it # doesn't already exist on the user's system. @@ -40,6 +40,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # argument is a set of non-required options. config.vm.synced_folder ".", "/salt_bootstrap" + config.vm.provision "shell", path: "bootstrap-salt.sh" # Provider-specific configuration so you can fine-tune various # backing providers for Vagrant. These expose provider-specific options. # Example for VirtualBox: