rabbah closed pull request #2903: fix ansible install errors in vagrant URL: https://github.com/apache/incubator-openwhisk/pull/2903
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/tools/ubuntu-setup/ansible.sh b/tools/ubuntu-setup/ansible.sh index 20c500ef10..7d8dee954f 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 d123b0bda3..cffa7d3f2a 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 0240e348ea..49b0549a46 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. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
