From: jose.lausuch <jose.lausuch@ericsson.com>
Date: Sun, 13 Nov 2016 15:47:07 +0000 (+0100)
Subject: Fix problem with neutron python version
X-Git-Tag: colorado.3.0~17
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F95%2F24295%2F1;p=functest.git

Fix problem with neutron python version

This patch tries to solve the conflict
with the neutron and keystone versions
Downgrading Rally, it doesn't need to install
the Newton clients.
https://build.opnfv.org/ci/view/functest/job/functest-fuel-baremetal-daily-colorado/561/console

Change-Id: I5795a2d5e3cefc8715fcc232db5be6abab69062e
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---

diff --git a/docker/Dockerfile b/docker/Dockerfile
index d5d0c8934..b204ca9c4 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -30,7 +30,7 @@ LABEL version="0.1" description="OPNFV Functest Docker container"
 
 ARG BRANCH=stable/colorado
 ARG TEMPEST_TAG=12.2.0
-ARG RALLY_TAG=0.5.0
+ARG RALLY_TAG=0.3.2
 ARG ODL_TAG=release/beryllium-sr3
 ARG OPENSTACK_TAG=stable/mitaka
 ARG KINGBIRD_TAG=0.2.2
@@ -102,9 +102,9 @@ RUN git clone --depth 1 -b $ODL_TAG https://git.opendaylight.org/gerrit/p/integr
 RUN git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test ${repos_dir}/vims-test
 RUN git clone --depth 1 https://github.com/wuwenbin2/OnosSystemTest.git ${repos_dir}/onos
 
-RUN pip install -r ${repos_dir}/functest/docker/requirements.pip
 RUN pip install -r ${repos_dir}/rally/requirements.txt
 RUN pip install -r ${repos_dir}/tempest/requirements.txt
+RUN pip install -r ${repos_dir}/functest/docker/requirements.pip
 
 RUN find ${repos_dir}/functest -name "*.py" |xargs grep __main__ |cut -d\: -f 1 |xargs chmod -c 755
 RUN find ${repos_dir}/functest -name "*.sh" |xargs grep \#\! |cut -d\:  -f 1 |xargs chmod -c 755
diff --git a/docker/requirements.pip b/docker/requirements.pip
index 7ba1a350c..13bdb0390 100644
--- a/docker/requirements.pip
+++ b/docker/requirements.pip
@@ -12,6 +12,7 @@ gitpython==1.0.1
 python-openstackclient==2.3.0
 python-ceilometerclient==1.5.1
 python-keystoneclient==2.3.1
+python-neutronclient==4.1.2
 virtualenv==1.11.4
 pexpect==4.0
 requests==2.8.0