Bugfix: openstack router list broken in Yardstick container - dovetail

Dependancy of python-openstackclient is not constrained.
This patch specify openstacksdk and openstackclient's version according to [1].

This patch apply for bugfix and need to backported to fraser stable branch.
Continual work need to be done in Gambia according to YARDSTICK-1398.

[1]
https://github.com/openstack/requirements/blob/stable/pike/upper-constraints.txt

JIRA: DOVETAIL-728

Change-Id: I57c718e192699ac322150458d18508b06c93d22b
Signed-off-by: rexlee8776 <limingjiang@huawei.com>
(cherry picked from commit 1e53af56c278921dad5671a5c4b8cafcdaa54ba9)
Signed-off-by: rexlee8776 <limingjiang@huawei.com>

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 240e7a6..4a4189f 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -26,7 +26,7 @@ ENV YARDSTICK_REPO_DIR="${REPOS_DIR}/yardstick/" \
 
 RUN apt-get update && apt-get install -y git python-setuptools python-pip iputils-ping && apt-get -y autoremove && apt-get clean
 RUN easy_install -U setuptools==30.0.0
-RUN pip install appdirs==1.4.0 pyopenssl==17.5.0 python-openstackclient==3.11.0 python-heatclient==1.11.0 ansible==2.4.2
+RUN pip install appdirs==1.4.0 pyopenssl==17.5.0 openstacksdk==0.9.17 python-openstackclient==3.12.1 python-heatclient==1.11.1 ansible==2.5.5
 
 RUN mkdir -p ${REPOS_DIR}
 

diff --git a/docker/Dockerfile.aarch64.patch b/docker/Dockerfile.aarch64.patch
index 8816fad..5b9cf0d 100644 (file)
--- a/docker/Dockerfile.aarch64.patch
+++ b/docker/Dockerfile.aarch64.patch
@@ -38,7 +38,7 @@ index 62ea0d0..f2f41771 100644
 +RUN apt-get update && apt-get install -y git python-setuptools python-pip iputils-ping && apt-get -y autoremove && \
 +    apt-get install -y libssl-dev && apt-get -y install libffi-dev && apt-get clean
  RUN easy_install -U setuptools==30.0.0
- RUN pip install appdirs==1.4.0 pyopenssl==17.5.0 python-openstackclient==3.11.0 python-heatclient==1.11.0 ansible==2.4.2
+ RUN pip install appdirs==1.4.0 pyopenssl==17.5.0 openstacksdk==0.9.17 python-openstackclient==3.12.1 python-heatclient==1.11.1 ansible==2.5.5
 
 @@ -48,8 +49,8 @@ RUN echo "daemon off;" >> /etc/nginx/nginx.conf
  # nginx=5000, rabbitmq=5672