[CVP] Align cvp-configuration 2018.4.0 branch with OS Pike release
Change-Id: Id2cc15cd649c2d2474d6a71a9f00ae10eebe8171
Related-PROD: PROD-29899
diff --git a/Dockerfile b/Dockerfile
index f7c4562..7b9b4fd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@
USER root
-RUN apt-get update; apt-get install -y inetutils-ping
+RUN apt-get update; apt-get install -y inetutils-ping curl wget
WORKDIR /var/lib/
@@ -15,13 +15,15 @@
popd;
RUN git clone https://github.com/openstack/telemetry-tempest-plugin && \
- pushd telemetry-tempest-plugin; pip install -r requirements.txt; \
+ pushd telemetry-tempest-plugin; git checkout 7a4bff728fbd8629ec211669264ab645aa921e2b; pip install -r requirements.txt; \
popd;
RUN git clone https://github.com/openstack/heat-tempest-plugin && \
- pushd heat-tempest-plugin; git checkout 0.1.0; pip install -r requirements.txt; \
+ pushd heat-tempest-plugin; git checkout 12b770e923060f5ef41358c37390a25be56634f0; pip install -r requirements.txt; \
popd;
+RUN pip install --force-reinstall python-cinderclient==3.2.0
+
COPY rally/ /var/lib/cvp-configuration/rally
COPY tempest/ /var/lib/cvp-configuration/tempest
COPY cleanup.sh /var/lib/cvp-configuration/cleanup.sh