[GitHub] csantanapr closed pull request #3614: Fix ubuntu14 setup for pip packages

[GitBox <gi...@apache.org>]

csantanapr closed pull request #3614: Fix ubuntu14 setup for pip packages 
URL: https://github.com/apache/incubator-openwhisk/pull/3614
 
 
   

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/README.md b/tools/ubuntu-setup/README.md
index 71056ce33d..35aafd9058 100644
--- a/tools/ubuntu-setup/README.md
+++ b/tools/ubuntu-setup/README.md
@@ -18,7 +18,7 @@
 
 # Setting up OpenWhisk on Ubuntu server(s)
 
-The following are verified to work on Ubuntu 14.04.3 LTS. You may need `sudo` or root access to install required software depending on your system setup.
+The following are verified to work on Ubuntu 14 LTS. You may need `sudo` or root access to install required software depending on your system setup.
 
 The commands below should be executed on the host machine for single VM/server deployments of OpenWhisk. For a distributed deployment spanning multiple VMs, the commands should be executed on a machine with network connectivity to all the VMs in the deployment - this is called the `bootstrapper` and it is ideally an Ubuntu 14.04 VM that is provisioned in an IaaS (infrastructure as a service platform e.g., OpenStack).  Your local machine can act as the bootstrapper as well if it can connect to the VMs deployed in your IaaS.
 
diff --git a/tools/ubuntu-setup/ansible.sh b/tools/ubuntu-setup/ansible.sh
index c2c42f29e9..e66f12a565 100755
--- a/tools/ubuntu-setup/ansible.sh
+++ b/tools/ubuntu-setup/ansible.sh
@@ -26,10 +26,10 @@ sudo apt-get update
 sudo apt-get install -y python-dev libffi-dev libssl-dev
 sudo pip install markupsafe
 sudo pip install ansible==2.5.0
-sudo pip install docker==2.2.1
 sudo pip install jinja2==2.9.6
-sudo pip install httplib2==0.9.2
-sudo pip install requests==2.10.0
+sudo pip install docker==2.2.1    --ignore-installed  --force-reinstall
+sudo pip install httplib2==0.9.2  --ignore-installed  --force-reinstall
+sudo pip install requests==2.10.0 --ignore-installed  --force-reinstall
 
 ansible --version
 ansible-playbook --version
diff --git a/tools/ubuntu-setup/java8.sh b/tools/ubuntu-setup/java8.sh
index ada5b387c9..73770f4e01 100755
--- a/tools/ubuntu-setup/java8.sh
+++ b/tools/ubuntu-setup/java8.sh
@@ -21,7 +21,7 @@ set -x
 
 if [ "$(lsb_release -cs)" == "trusty" ]; then
     sudo apt-get install -y software-properties-common python-software-properties
-    sudo add-apt-repository ppa:jonathonf/openjdk
+    sudo add-apt-repository ppa:jonathonf/openjdk -y
     sudo apt-get update
 fi
 


 

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services