From 4b51cb01429bbdb3d8f03d03ae6df32bfd12c09b Mon Sep 17 00:00:00 2001
From: Stephen Taylor <stephen.taylor.1@att.com>
Date: Fri, 13 Oct 2023 11:00:04 -0600
Subject: [PATCH] Replace py-bcrypt with python3-bcrypt

The ceph-mgr bcrypt dependency that was supposed to be resolved by
https://review.opendev.org/c/openstack/openstack-helm-images/+/898136
is still an issue. Installing the python3-bcrypt package via apt
instead of installing py-bcrypt via pip3 resolves it.

Change-Id: If39c85775a0cee584d1b7005b8abfc71a0cf814e
---
 ceph-daemon/Dockerfile.ubuntu_focal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ceph-daemon/Dockerfile.ubuntu_focal b/ceph-daemon/Dockerfile.ubuntu_focal
index cd704876..5b10865b 100644
--- a/ceph-daemon/Dockerfile.ubuntu_focal
+++ b/ceph-daemon/Dockerfile.ubuntu_focal
@@ -44,6 +44,7 @@ RUN set -ex ;\
         curl \
         python3 \
         python3-dev \
+        python3-bcrypt \
         uuid-runtime \
         jq \
         alien \
@@ -54,7 +55,6 @@ RUN set -ex ;\
       six \
       openssl-python \
       pyopenssl \
-      py-bcrypt \
       python-openstackclient \
       python-swiftclient ;\
     curl -sSL https://dl.k8s.io/v${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz | tar -zxv --strip-components=1 ;\