Merge "Make sure we have installed python_novaclient==6.0.0"

diff --git a/docker/Dockerfile b/docker/Dockerfile
index b59d2c8..dda4ea6 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -115,6 +115,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_VNFS_DIR}/vims-test
 RUN git clone --depth 1 https://github.com/wuwenbin2/OnosSystemTest.git ${REPOS_DIR}/onos
 
+RUN pip install -r ${REPOS_DIR}/rally/requirements.txt
+RUN pip install -r ${REPOS_DIR}/tempest/requirements.txt
+
 RUN cd ${FUNCTEST_REPO_DIR} \
     && pip install -r requirements.txt \
     && pip install .
@@ -122,9 +125,6 @@ RUN cd ${FUNCTEST_REPO_DIR} \
 RUN cd ${RELENG_MODULE_DIR} \
     && pip install .
 
-RUN pip install -r ${REPOS_DIR}/rally/requirements.txt
-RUN pip install -r ${REPOS_DIR}/tempest/requirements.txt
-
 RUN find ${FUNCTEST_REPO_DIR} -name "*.py" \
     -not -path "*tests/unit*" |xargs grep __main__ |cut -d\: -f 1 |xargs chmod -c 755 \
     && find ${FUNCTEST_REPO_DIR} -name "*.sh" |xargs grep \#\! |cut -d\:  -f 1 |xargs chmod -c 755

diff --git a/requirements.txt b/requirements.txt
index 28b3fed..b5e78bb 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,6 +11,7 @@ python-openstackclient==2.3.0
 python-ceilometerclient==2.6.2
 python-keystoneclient==3.5.0
 python-neutronclient==6.0.0
+python-novaclient==6.0.0
 python-congressclient==1.5.0
 virtualenv==15.1.0
 pexpect==4.0