repo: add mgr-alias-ceph-bcrypt.patch

So that the mgr _actually_ uses our internal bcrypt fork.

1 files changed, 26 insertions, 0 deletions

diff --git a/ceph-18.2.2-mgr-alias-ceph-bcrypt.patch b/ceph-18.2.2-mgr-alias-ceph-bcrypt.patch
new file mode 100644
index 000000000000..6c8ad96b03c5
--- /dev/null
+++ b/ceph-18.2.2-mgr-alias-ceph-bcrypt.patch
@@ -0,0 +1,26 @@
+diff --git a/src/pybind/mgr/dashboard/services/access_control.py b/src/pybind/mgr/dashboard/services/access_control.py
+index 0cbe49bb160..3a8b4ace288 100644
+--- a/src/pybind/mgr/dashboard/services/access_control.py
++++ b/src/pybind/mgr/dashboard/services/access_control.py
+@@ -12,7 +12,7 @@ from datetime import datetime, timedelta
+ from string import ascii_lowercase, ascii_uppercase, digits, punctuation
+ from typing import List, Optional, Sequence
+ 
+-import bcrypt
++import ceph_bcrypt as bcrypt
+ from mgr_module import CLICheckNonemptyFileInput, CLIReadCommand, CLIWriteCommand
+ from mgr_util import password_hash
+ 
+diff --git a/src/pybind/mgr/mgr_util.py b/src/pybind/mgr/mgr_util.py
+index 8684f801318..b2ab1c1568e 100644
+--- a/src/pybind/mgr/mgr_util.py
++++ b/src/pybind/mgr/mgr_util.py
+@@ -3,7 +3,7 @@ import os
+ if 'UNITTEST' in os.environ:
+     import tests
+ 
+-import bcrypt
++import ceph_bcrypt as bcrypt
+ import cephfs
+ import contextlib
+ import datetime