From fd5d1424fe45080039bbdb3b10fdbd766054eb71 Mon Sep 17 00:00:00 2001
From: Sergiy Markin <smarkin@mirantis.com>
Date: Mon, 6 Mar 2023 19:24:16 +0000
Subject: [PATCH] [images] Utility containers

This PS alters utility containers images:
- adds munch python module required for openstack client
- adds python-heatclient for adding heat client to openstack utility

Change-Id: I205c5d74f1cf88a82c4f5ce4652b107a8676f3fe
---
 images/etcdctl-utility/Dockerfile.ubuntu_focal     | 1 +
 images/mysqlclient-utility/Dockerfile.ubuntu_focal | 1 +
 images/openstack-utility/Dockerfile.ubuntu_focal   | 2 ++
 images/postgresql-utility/Dockerfile.ubuntu_focal  | 1 +
 4 files changed, 5 insertions(+)

diff --git a/images/etcdctl-utility/Dockerfile.ubuntu_focal b/images/etcdctl-utility/Dockerfile.ubuntu_focal
index f5c0fa40..af24005b 100644
--- a/images/etcdctl-utility/Dockerfile.ubuntu_focal
+++ b/images/etcdctl-utility/Dockerfile.ubuntu_focal
@@ -36,6 +36,7 @@ RUN set -xe \
        rclone \
     && pip3 install --upgrade pip \
     && pip3 install \
+        munch \
         oslo.rootwrap==6.3.1 \
         python-openstackclient==5.8.0 \
         python-swiftclient==3.13.1 \
diff --git a/images/mysqlclient-utility/Dockerfile.ubuntu_focal b/images/mysqlclient-utility/Dockerfile.ubuntu_focal
index c16b50f2..c43ec9d1 100644
--- a/images/mysqlclient-utility/Dockerfile.ubuntu_focal
+++ b/images/mysqlclient-utility/Dockerfile.ubuntu_focal
@@ -36,6 +36,7 @@ RUN set -xe \
        rclone \
     && pip3 install --upgrade pip \
     && pip3 install \
+         munch \
          oslo.rootwrap==6.3.1 \
          python-openstackclient==5.8.0 \
          python-swiftclient==3.13.1 \
diff --git a/images/openstack-utility/Dockerfile.ubuntu_focal b/images/openstack-utility/Dockerfile.ubuntu_focal
index a9749455..32e38e2b 100755
--- a/images/openstack-utility/Dockerfile.ubuntu_focal
+++ b/images/openstack-utility/Dockerfile.ubuntu_focal
@@ -22,12 +22,14 @@ RUN set -xe \
        python3-pip \
     && pip3 install --upgrade pip \
     && pip3 install \
+        munch \
         oslo.rootwrap==6.3.1 \
         python-openstackclient==5.8.0 \
         python-glanceclient==3.6.0 \
         python-novaclient==17.7.0 \
         python-neutronclient==7.8.0 \
         python-cinderclient==8.3.0 \
+        python-heatclient==2.5.1 \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/images/postgresql-utility/Dockerfile.ubuntu_focal b/images/postgresql-utility/Dockerfile.ubuntu_focal
index e9d31087..439a15f5 100644
--- a/images/postgresql-utility/Dockerfile.ubuntu_focal
+++ b/images/postgresql-utility/Dockerfile.ubuntu_focal
@@ -34,6 +34,7 @@ RUN set -xe  \
         rclone \
     && pip3 install --upgrade pip \
     && pip3 install \
+        munch \
         oslo.rootwrap==6.3.1 \
         python-openstackclient==5.8.0 \
         python-swiftclient==3.13.1 \