You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by cs...@apache.org on 2017/08/01 11:53:58 UTC

[incubator-openwhisk] branch master updated: Jinja2 version 2.9.6 required for Ansible template processing (#2543)

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

csantanapr 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 5449185  Jinja2 version 2.9.6 required for Ansible template processing (#2543)
5449185 is described below

commit 5449185b1dcaf25def7ede2765005db3b3b69f96
Author: Sven Lange-Last <sv...@de.ibm.com>
AuthorDate: Tue Aug 1 13:53:56 2017 +0200

    Jinja2 version 2.9.6 required for Ansible template processing (#2543)
    
    * Jinja2 version 2.9.6 required for Ansible template processing
    
    * Added requirement for Jinja2 2.9.6 to other docs and scripts
---
 ansible/README.md                    | 4 +++-
 tools/macos/README.md                | 2 +-
 tools/macos/docker-machine/README.md | 3 ++-
 tools/ubuntu-setup/ansible.sh        | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ansible/README.md b/ansible/README.md
index 176665f..6d01601 100644
--- a/ansible/README.md
+++ b/ansible/README.md
@@ -10,6 +10,7 @@ If you want to deploy OpenWhisk locally using Ansible, you first need to install
 ```
 sudo apt-get install python-pip
 sudo pip install ansible==2.3.0.0
+sudo pip install jinja2==2.9.6
 ```
 
 #### Vagrant users
@@ -21,9 +22,10 @@ You may jump directly to [Deploying Using CouchDB](#deploying-using-couchdb)
 ```
 sudo easy_install pip
 sudo pip install ansible==2.3.0.0
+pip install jinja2==2.9.6
 ```
 Docker for Mac does not provide any official ways to meet some requirements for OpenWhisk.
-You need to depends on the workarounds until Docker provides official methods.
+You need to depend on the workarounds until Docker provides official methods.
 
 If you prefer [Docker-machine](https://docs.docker.com/machine/) to [Docker for mac](https://docs.docker.com/docker-for-mac/), you can follow instructions in [docker-machine/README.md](../tools/macos/docker-machine/README.md).
 
diff --git a/tools/macos/README.md b/tools/macos/README.md
index 7bd1cba..24eeb7d 100644
--- a/tools/macos/README.md
+++ b/tools/macos/README.md
@@ -32,7 +32,7 @@ sudo easy_install pip
 # install docker for python
 /usr/local/bin/pip install docker==2.2.1
 # install script prerequisites
-sudo -H pip install ansible==2.3.0.0 jsonschema couchdb' | bash
+sudo -H pip install ansible==2.3.0.0 jinja2==2.9.6 jsonschema couchdb' | bash
 ```
 
 # Build
diff --git a/tools/macos/docker-machine/README.md b/tools/macos/docker-machine/README.md
index 0f7b1e2..831edf3 100644
--- a/tools/macos/docker-machine/README.md
+++ b/tools/macos/docker-machine/README.md
@@ -37,7 +37,7 @@ brew install scala
 # install pip
 sudo easy_install pip
 # install script prerequisites
-sudo -H pip install ansible==2.3.0.0 jsonschema couchdb' | bash
+sudo -H pip install ansible==2.3.0.0 jinja2==2.9.6 jsonschema couchdb' | bash
 ```
 
 # Create and configure Docker machine
@@ -112,6 +112,7 @@ cd /your/path/to/openwhisk
 ```
 brew install python
 pip install ansible==2.3.0.0
+pip install jinja2==2.9.6
 
 cd ansible
 ansible-playbook -i environments/docker-machine setup.yml [-e docker_machine_name=whisk]
diff --git a/tools/ubuntu-setup/ansible.sh b/tools/ubuntu-setup/ansible.sh
index b1588bf..2a58e7d 100755
--- a/tools/ubuntu-setup/ansible.sh
+++ b/tools/ubuntu-setup/ansible.sh
@@ -9,6 +9,7 @@ sudo apt-get install -y python-dev libffi-dev libssl-dev
 sudo pip install markupsafe
 sudo pip install ansible==2.3.0.0
 sudo pip install docker==2.2.1
+sudo pip install jinja2==2.9.6
 
 ansible --version
 ansible-playbook --version
\ No newline at end of file

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