diff --git a/.gitignore b/.gitignore index 18550fc1..1d9f0c69 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,7 @@ celery*.log *.dot *.png resources_compiled.py + +# bootstrap +bootstrap/trusty64 +bootstrap/solar-master.box diff --git a/Vagrantfile b/Vagrantfile index 539766f9..756a1e2b 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -5,38 +5,31 @@ VAGRANTFILE_API_VERSION = "2" SLAVES_COUNT = 2 -init_script = <