diff options
| author | Toby Oxborrow <tobyox@cisco.com> | 2015-09-14 18:29:24 +0800 |
|---|---|---|
| committer | Toby Oxborrow <tobyox@cisco.com> | 2015-09-14 18:37:03 +0800 |
| commit | f7f4dab49f8d5c750e36870f78009ff1fb6df2f5 (patch) | |
| tree | 617ed336204a4bebfa3ec289059cc50b4a73764a /Vagrantfile | |
| parent | cb8c160edd9825120f9094788192fadfe8bb7fc3 (diff) | |
Fix vagrant provision
* Correct path to activate
* More robust .bashrc editing
* Git ignore .vagrant directory
Diffstat (limited to 'Vagrantfile')
| -rw-r--r-- | Vagrantfile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Vagrantfile b/Vagrantfile index 0ad753e..ddf0ece 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -8,9 +8,13 @@ sudo apt-get update sudo apt-get install -y python-pip python-virtualenv git ipython cd /vagrant virtualenv .venv -source .venv/bin/active +source .venv/bin/activate pip install -r requirements.txt pip install -r test-requirements.txt +grep 'cd /vagrant' /home/vagrant/.bashrc || + echo 'cd /vagrant' >> /home/vagrant/.bashrc +grep 'source .venv/bin/activate' /home/vagrant/.bashrc || + echo 'source .venv/bin/activate' >> /home/vagrant/.bashrc EOF Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| @@ -18,7 +22,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.box = "ubuntu/trusty64" config.vm.define "dev" do |dev| - dev.vm.provision "shell", inline: " echo 'cd /vagrant' >> /home/vagrant/.bashrc && #{INSTALL_DEPS}" + dev.vm.provision "shell", inline: "#{INSTALL_DEPS}" end end |