From 3c89b317125cf48412829cb10bb96fe29c95adac Mon Sep 17 00:00:00 2001
From: Lusheng Ji <lji@research.att.com>
Date: Thu, 5 Apr 2018 22:21:12 -0400
Subject: Fix pip version

Virtualenv automatically pulls the newest pip.
Pip 10.0.0 was release on 2018/03/31. This new version no longer
supports the --use-wheel option.  Hence when running wagon install,
which depends on pip --use-wheel, the bootstrap container quits.
Fix: add a line to force pip to be a specific version, not auto to
newest.

Issue-ID: DCAEGEN2-433
Change-Id: I2d7e0a71c1b50682458abb658c62914931115869
Signed-off-by: Lusheng Ji <lji@research.att.com>
---
 bootstrap/installer-docker.sh-template | 3 +++
 bootstrap/pom.xml                      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bootstrap/installer-docker.sh-template b/bootstrap/installer-docker.sh-template
index b056ca1..9c19fdb 100755
--- a/bootstrap/installer-docker.sh-template
+++ b/bootstrap/installer-docker.sh-template
@@ -94,6 +94,9 @@ chmod 600 ${PVTKEY}
 virtualenv dcaeinstall
 source dcaeinstall/bin/activate
 
+# forcing pip version (pip>=10.0.0 no longer support use wheel)
+pip install pip==9.0.3 
+
 # Install Cloudify
 pip install cloudify==3.4.0
 
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index c617385..9f1a043 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -28,7 +28,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
   <groupId>org.onap.dcaegen2.deployments</groupId>
   <artifactId>bootstrap</artifactId>
   <name>dcaegen2-deployments-bootstrap</name>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-- 
cgit 1.2.3-korg