[incubator-openwhisk] branch master updated: fix ansible install errors in vagrant (#2903)

[ra...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new 7d6adea  fix ansible install errors in vagrant (#2903)
7d6adea is described below

commit 7d6adea47272f77750e8debfa61b8acc8adec86d
Author: Carlos Santana <cs...@gmail.com>
AuthorDate: Wed Oct 25 21:42:40 2017 -0400

    fix ansible install errors in vagrant (#2903)
---
 tools/ubuntu-setup/ansible.sh | 1 +
 tools/ubuntu-setup/scala.sh   | 4 ++--
 tools/vagrant/Vagrantfile     | 5 +----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/tools/ubuntu-setup/ansible.sh b/tools/ubuntu-setup/ansible.sh
index 20c500e..7d8dee9 100755
--- a/tools/ubuntu-setup/ansible.sh
+++ b/tools/ubuntu-setup/ansible.sh
@@ -2,6 +2,7 @@
 set -e
 set -x
 
+sudo pip install --upgrade setuptools
 sudo apt-get install -y software-properties-common
 sudo apt-add-repository -y ppa:ansible/ansible
 sudo apt-get update
diff --git a/tools/ubuntu-setup/scala.sh b/tools/ubuntu-setup/scala.sh
index d123b0b..cffa7d3 100755
--- a/tools/ubuntu-setup/scala.sh
+++ b/tools/ubuntu-setup/scala.sh
@@ -2,7 +2,7 @@
 set -e
 set -x
 
-wget www.scala-lang.org/files/archive/scala-2.11.6.deb -O /tmp/scala-2.11.6.deb
-sudo dpkg -i /tmp/scala-2.11.6.deb
+wget www.scala-lang.org/files/archive/scala-2.11.8.deb -O /tmp/scala-2.11.8.deb
+sudo dpkg -i /tmp/scala-2.11.8.deb
 sudo apt-get update
 sudo apt-get install -y scala
\ No newline at end of file
diff --git a/tools/vagrant/Vagrantfile b/tools/vagrant/Vagrantfile
index 0240e34..49b0549 100644
--- a/tools/vagrant/Vagrantfile
+++ b/tools/vagrant/Vagrantfile
@@ -8,8 +8,7 @@
 # Don't use vagrant resume, it will run the provisioning a second producing errors
 # Use vagrant suspend and vagrant up (using up it skips provisioning)
 
-BOX = "ubuntu/trusty64-2"
-BOX_URL =  "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
+BOX = "ubuntu/trusty64"
 BOX_MEMORY = ENV['BOX_MEMORY'] || '4096'
 BOX_CPUS = ENV['BOX_CPUS'] || '4'
 MACHINE_IP = ENV['MACHINE_IP'] || '192.168.33.13'
@@ -17,8 +16,6 @@ OW_DB = if ENV['OW_DB'] =~ (/^(cloudant|couchdb)$/i) then true else false end
 
 Vagrant.configure('2') do |config|
   config.vm.box = BOX
-  config.vm.box_url = BOX_URL
-
   config.vm.network :private_network, ip: MACHINE_IP
 
   # If true, then any SSH connections made will enable agent forwarding.

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].