From: Steven Hardy <shardy@redhat.com>
Date: Wed, 11 Jan 2017 11:47:11 +0000 (+0000)
Subject: Fix error path for tools/process-templates.py
X-Git-Tag: opnfv-6.0.0~1256^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3af65ff57416cee8576f865f6006fa407845ef2f;p=apex-tripleo-heat-templates.git

Fix error path for tools/process-templates.py

The error path for this fails because we don't import six
or install it in the templates tox venv

Change-Id: Ie9f46332f2b03d48a1b0a4a432e9721757833569
---

diff --git a/requirements.txt b/requirements.txt
index 3f157628..555b240d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,3 +3,4 @@
 # process, which may cause wedges in the gate later.
 pbr>=1.8 # Apache-2.0
 Jinja2>=2.8 # BSD License (3 clause)
+six>=1.9.0 # MIT
diff --git a/test-requirements.txt b/test-requirements.txt
index 6489b16c..faf4893f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,3 +2,5 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 PyYAML>=3.10.0 # MIT
+Jinja2>=2.8 # BSD License (3 clause)
+six>=1.9.0 # MIT
diff --git a/tools/process-templates.py b/tools/process-templates.py
index a15b00e2..9a06812b 100755
--- a/tools/process-templates.py
+++ b/tools/process-templates.py
@@ -14,6 +14,7 @@
 import argparse
 import jinja2
 import os
+import six
 import sys
 import yaml