From 9f9d8d39be8708e18d4d3d2a518f09fa890b050e Mon Sep 17 00:00:00 2001
From: "Dodda, Prateek Dodda" <pd2839@att.com>
Date: Tue, 28 Jan 2020 11:01:05 -0600
Subject: [PATCH] upgarding Openstack Utility client version to stein.

Change-Id: Ic9574834cdb5c120f837eae8bbe5746fbf6b39a0
---
 .../templates/bin/_start.sh.tpl                  |  8 ++++----
 .../openstack-utility/Dockerfile.ubuntu_bionic   | 16 +++++++++-------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/charts/openstack-utility/templates/bin/_start.sh.tpl b/charts/openstack-utility/templates/bin/_start.sh.tpl
index f53b32d0..0e6319bc 100644
--- a/charts/openstack-utility/templates/bin/_start.sh.tpl
+++ b/charts/openstack-utility/templates/bin/_start.sh.tpl
@@ -23,7 +23,7 @@ root logger by oslo-rootwrap module, imported in _openstack-utility-rootwrap.tpl
 These lines will get rid of duplicate logs, generated because of the formatter
 attached by oslo-rootwrap.
 */}}
-sed -i "/rootwrap_logger.setLevel/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py
-sed -i "/handler.setFormatter/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py
-sed -i "/os.path.basename/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py
-sed -i "/rootwrap_logger.addHandler/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py
+sed -i "/rootwrap_logger.setLevel/s/.*/#&/" /usr/local/lib/python3.6/dist-packages/oslo_rootwrap/wrapper.py
+sed -i "/handler.setFormatter/s/.*/#&/" /usr/local/lib/python3.6/dist-packages/oslo_rootwrap/wrapper.py
+sed -i "/os.path.basename/s/.*/#&/" /usr/local/lib/python3.6/dist-packages/oslo_rootwrap/wrapper.py
+sed -i "/rootwrap_logger.addHandler/s/.*/#&/" /usr/local/lib/python3.6/dist-packages/oslo_rootwrap/wrapper.py
diff --git a/images/openstack-utility/Dockerfile.ubuntu_bionic b/images/openstack-utility/Dockerfile.ubuntu_bionic
index 589133d3..ba24de44 100755
--- a/images/openstack-utility/Dockerfile.ubuntu_bionic
+++ b/images/openstack-utility/Dockerfile.ubuntu_bionic
@@ -16,15 +16,17 @@ RUN set -xe && \
     apt-get update && \
     apt-get install -y \
       bash \
+      sudo \
       rsyslog \
       python3 \
-      python3-pip \
-      python3-oslo.rootwrap \
-      python3-openstackclient \
-      python3-glanceclient \
-      python3-novaclient \
-      python3-neutronclient \
-      python3-cinderclient && \
+      python3-pip &&\
+    pip3 install \
+      oslo.rootwrap==5.8.0 \
+      python-openstackclient==3.18.1 \
+      python-glanceclient==2.16.0 \
+      python-novaclient==13.0.2 \
+      python-neutronclient==6.12.0 \
+      python-cinderclient==4.2.1 && \
     apt-get clean -y && \
     rm -rf /var/lib/apt/lists/*