csantanapr closed pull request #3625: Bump Ansible to 2.5.2 URL: https://github.com/apache/incubator-openwhisk/pull/3625
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/ansible/README.md b/ansible/README.md index 6b43c3f1f6..7d158327ec 100644 --- a/ansible/README.md +++ b/ansible/README.md @@ -26,7 +26,7 @@ If you want to deploy OpenWhisk locally using Ansible, you first need to install #### Ubuntu users ``` sudo apt-get install python-pip -sudo pip install ansible==2.5.0 +sudo pip install ansible==2.5.2 sudo pip install jinja2==2.9.6 ``` @@ -38,7 +38,7 @@ You may jump directly to [Deploying Using CouchDB](#deploying-using-couchdb) #### Docker for Mac users ``` sudo easy_install pip -sudo pip install ansible==2.5.0 +sudo pip install ansible==2.5.2 pip install jinja2==2.9.6 ``` Docker for Mac does not provide any official ways to meet some requirements for OpenWhisk. diff --git a/tools/macos/README.md b/tools/macos/README.md index 2bc0ca69a9..a7a172489d 100644 --- a/tools/macos/README.md +++ b/tools/macos/README.md @@ -28,7 +28,7 @@ The following are required to build and deploy OpenWhisk from a Mac host: - [Docker 1.12.0](https://docs.docker.com/docker-for-mac/) - [Java 8](http://www.oracle.com/technetwork/java/javase/downloads/index.html) - [Scala 2.11](http://scala-lang.org/download/) -- [Ansible 2.5.0](http://docs.ansible.com/ansible/intro_installation.html) +- [Ansible 2.5.2](http://docs.ansible.com/ansible/intro_installation.html) **Tip** Versions of Docker and Ansible are lower than the latest released versions, the versions used in OpenWhisk are pinned to have stability during continuous integration and deployment. @@ -50,7 +50,7 @@ brew install scala # install pip sudo easy_install pip # install script prerequisites -sudo -H pip install docker==2.2.1 ansible==2.5.0 jinja2==2.9.6 couchdb==1.1 httplib2==0.9.2 requests==2.10.0' | bash +sudo -H pip install docker==2.2.1 ansible==2.5.2 jinja2==2.9.6 couchdb==1.1 httplib2==0.9.2 requests==2.10.0' | bash ``` # Build diff --git a/tools/macos/docker-machine/README.md b/tools/macos/docker-machine/README.md index 848f0e080d..3d956ded37 100644 --- a/tools/macos/docker-machine/README.md +++ b/tools/macos/docker-machine/README.md @@ -29,7 +29,7 @@ The following are required to build and deploy OpenWhisk from a Mac host: - [Docker 1.12.0](https://docs.docker.com/engine/installation/mac/) (including `docker-machine`) - [Java 8](http://www.oracle.com/technetwork/java/javase/downloads/index.html) - [Scala 2.11](http://scala-lang.org/download/) -- [Ansible 2.5.0](http://docs.ansible.com/ansible/intro_installation.html) +- [Ansible 2.5.2](http://docs.ansible.com/ansible/intro_installation.html) **Tip** Versions of Docker and Ansible are lower than the latest released versions, the versions used in OpenWhisk are pinned to have stability during continues integration and deployment. @@ -55,7 +55,7 @@ brew install scala # install pip sudo easy_install pip # install script prerequisites -sudo -H pip install docker==2.2.1 ansible==2.5.0 jinja2==2.9.6 couchdb==1.1 httplib2==0.9.2 requests==2.10.0' | bash +sudo -H pip install docker==2.2.1 ansible==2.5.2 jinja2==2.9.6 couchdb==1.1 httplib2==0.9.2 requests==2.10.0' | bash ``` # Create and configure Docker machine diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh index 0337e73472..89cc76bdc0 100755 --- a/tools/travis/setup.sh +++ b/tools/travis/setup.sh @@ -32,4 +32,4 @@ docker info pip install --user couchdb # Ansible -pip install --user ansible==2.5.0 +pip install --user ansible==2.5.2 diff --git a/tools/ubuntu-setup/ansible.sh b/tools/ubuntu-setup/ansible.sh index e66f12a565..7520004f73 100755 --- a/tools/ubuntu-setup/ansible.sh +++ b/tools/ubuntu-setup/ansible.sh @@ -25,7 +25,7 @@ sudo apt-add-repository -y ppa:ansible/ansible 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 ansible==2.5.2 sudo pip install jinja2==2.9.6 sudo pip install docker==2.2.1 --ignore-installed --force-reinstall sudo pip install httplib2==0.9.2 --ignore-installed --force-reinstall ---------------------------------------------------------------- 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
