Merge branch 'main' into fix/caas-upgrade

Author: wtripp180901

requirements.txt

@@ -4,6 +4,7 @@ python-openstackclient==8.0.0
 python-manilaclient
 python-ironicclient
 jmespath
+bcrypt==4.3.0
 passlib[bcrypt]==1.7.4
 cookiecutter
 selinux # this is a shim to avoid having to use --system-site-packages, you still need sudo yum install libselinux-python3