From b29f1af8a1d821c675bcd4bb35f6a1e1a6247170 Mon Sep 17 00:00:00 2001 From: Raymond Yee Date: Mon, 6 Jul 2015 16:44:55 -0700 Subject: [PATCH 1/2] wire localvm into Vagrantfile --- vagrant/Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile index c2cb2023..f7035f6b 100644 --- a/vagrant/Vagrantfile +++ b/vagrant/Vagrantfile @@ -107,7 +107,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| node.vm.box = "precise64" #node.vm.network "private_network", type: "dhcp" - node.vm.network "private_network", ip: "192.168.33.10" + node.vm.network "private_network", ip: "192.168.33.10" #https://192.168.33.10.xip.io node.ssh.forward_agent = true @@ -118,7 +118,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # trying to mimic https://github.com/mozilla/fxa-dev/blob/b9b6f347c786428b347b82d38fb67e2c2fd1b827/vagrant/Vagrantfile # but this doesn't work override.vm.provision "ansible" do |ansible| - ansible.playbook = 'hello2.yml' + ansible.playbook = 'localvm.yml' #ansible.start_at_task = 'remove all default enabled sites' end From c8af2e41945296ea782d0cad0ed1b964a2851f62 Mon Sep 17 00:00:00 2001 From: Raymond Yee Date: Tue, 25 Aug 2015 21:05:11 -0400 Subject: [PATCH 2/2] add libjpg dependency --- vagrant/just.yml | 1 + vagrant/please.yml | 1 + vagrant/roles/common/tasks/main.yml | 1 + vagrant/unglueit.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/vagrant/just.yml b/vagrant/just.yml index 04ed8bfd..c93cfac2 100644 --- a/vagrant/just.yml +++ b/vagrant/just.yml @@ -46,6 +46,7 @@ - redis-server - python-lxml - python-dev + - libjpeg-dev - libmysqlclient-dev - libxml2-dev - libxslt1-dev diff --git a/vagrant/please.yml b/vagrant/please.yml index 183f864d..7089670d 100644 --- a/vagrant/please.yml +++ b/vagrant/please.yml @@ -47,6 +47,7 @@ - redis-server - python-lxml - python-dev + - libjpeg-dev - libmysqlclient-dev - libxml2-dev - libxslt1-dev diff --git a/vagrant/roles/common/tasks/main.yml b/vagrant/roles/common/tasks/main.yml index 73856af0..b2c1459e 100644 --- a/vagrant/roles/common/tasks/main.yml +++ b/vagrant/roles/common/tasks/main.yml @@ -18,6 +18,7 @@ - redis-server - python-lxml - python-dev + - libjpeg-dev - libmysqlclient-dev - libxml2-dev - libxslt1-dev diff --git a/vagrant/unglueit.yml b/vagrant/unglueit.yml index 7854459d..40564e6c 100644 --- a/vagrant/unglueit.yml +++ b/vagrant/unglueit.yml @@ -46,6 +46,7 @@ - redis-server - python-lxml - python-dev + - libjpeg-dev - libmysqlclient-dev - libxml2-dev - libxslt1-dev