From: kasar <pkasar@vmware.com>
Date: Wed, 17 Jan 2018 11:04:27 +0000 (-0800)
Subject: Modified install-openmano.sh to use pyvcloud version 18.2.2
X-Git-Tag: v3.0.3~14
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=commitdiff_plain;h=0dc928066a89b2cfae8e98bc76062af1ff4a751c;hp=96ebf005b6e73f6cef105aa5f9ab36402f3d26c4

Modified install-openmano.sh to use pyvcloud version 18.2.2

Change-Id: I252a4635d7e7297115bf85f291d3e49482997949
Signed-off-by: kasar <pkasar@vmware.com>
---

diff --git a/Dockerfile b/Dockerfile
index f901e9ef..c8f439e5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ RUN  apt-get update && \
   DEBIAN_FRONTEND=noninteractive add-apt-repository -y cloud-archive:ocata && \
   DEBIAN_FRONTEND=noninteractive apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get -y install python-novaclient python-keystoneclient python-glanceclient python-cinderclient python-neutronclient && \
-  DEBIAN_FRONTEND=noninteractive pip install -U progressbar pyvmomi pyvcloud && \
+  DEBIAN_FRONTEND=noninteractive pip install -U progressbar pyvmomi pyvcloud==18.2.2 && \
   DEBIAN_FRONTEND=noninteractive apt-get -y install python-argcomplete python-bottle python-cffi python-packaging python-paramiko python-pkgconfig libmysqlclient-dev libssl-dev libffi-dev python-mysqldb && \
   DEBIAN_FRONTEND=noninteractive apt-get -y install python-logutils python-openstackclient python-openstacksdk
 
diff --git a/requirements.txt b/requirements.txt
index 0d6c4324..2bfca00a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ python-keystoneclient
 python-glanceclient
 python-neutronclient
 python-cinderclient
-pyvcloud
+pyvcloud==18.2.2
 pyvmomi
 progressbar
 prettytable
diff --git a/scripts/install-openmano.sh b/scripts/install-openmano.sh
index 98db3680..6be885ec 100755
--- a/scripts/install-openmano.sh
+++ b/scripts/install-openmano.sh
@@ -249,7 +249,7 @@ then
 
     # required for vmware connector TODO move that to separete opt in install script
     pip install --upgrade pip || exit 1
-    pip install pyvcloud || exit 1
+    pip install pyvcloud==18.2.2 || exit 1
     pip install progressbar || exit 1
     pip install prettytable || exit 1
     pip install pyvmomi || exit 1
diff --git a/scripts/python-osm-ro.postinst b/scripts/python-osm-ro.postinst
index b2a2ff2f..01ce8670 100755
--- a/scripts/python-osm-ro.postinst
+++ b/scripts/python-osm-ro.postinst
@@ -23,7 +23,7 @@ OSMRO_PATH=`python -c 'import osm_ro; print osm_ro.__path__[0]'`
 
 #Pip packages required for vmware connector
 pip install --upgrade pip
-pip install --upgrade pyvcloud
+pip install --upgrade pyvcloud==18.2.2
 pip install --upgrade progressbar
 pip install --upgrade prettytable
 pip install --upgrade pyvmomi