5 files changed, 105 insertions, 81 deletions

diff --git a/net/ceph14/Makefile b/net/ceph14/Makefile
index 1f340533d425..4d8896ffec7e 100644
--- a/net/ceph14/Makefile
+++ b/net/ceph14/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	ceph
 DISTVERSIONPREFIX=	v
 DISTVERSION=	14.2.7
+PORTREVISION=	1
 CATEGORIES=	net
 PKGNAMESUFFIX=	14
 
@@ -19,12 +20,11 @@ ONLY_FOR_ARCHS=	amd64
 BUILD_DEPENDS=	\
 	bash:shells/bash \
 	git:devel/git \
+	gperf:devel/gperf \
 	yasm:devel/yasm \
 	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
-	gperf:devel/gperf \
 	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops \
-	${LOCALBASE}/bin/ld:devel/binutils \
-	npm:www/npm
+	${LOCALBASE}/bin/ld:devel/binutils
 LIB_DEPENDS=	\
 	${PY_BOOST} \
 	libboost_thread.so:devel/boost-libs \
@@ -42,10 +42,10 @@ LIB_DEPENDS=	\
 	librabbitmq.so:net/rabbitmq-c
 RUN_DEPENDS=	\
 	bash:shells/bash \
-	${LOCALBASE}/bin/getopt:misc/getopt \
-	xml:textproc/xmlstarlet \
-	jq:textproc/jq \
 	flock:sysutils/flock \
+	jq:textproc/jq \
+	xml:textproc/xmlstarlet \
+	${LOCALBASE}/bin/getopt:misc/getopt \
 	${LOCALBASE}/sbin/smartctl:sysutils/smartmontools \
 	${PYTHON_PKGNAMEPREFIX}grpcio>=0:devel/py-grpcio@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} \
@@ -62,8 +62,8 @@ RUN_DEPENDS=	\
 	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${PY_FLAVOR}
 
-USES=		cmake:noninja dos2unix fuse gettext-runtime gmake pkgconfig python:3.7 \
-		shebangfix ssl
+USES=		cmake:noninja dos2unix fuse gettext-runtime gmake ncurses \
+		pkgconfig python:3.7+ shebangfix ssl
 USE_PYTHON=	cython
 USE_OPENLDAP=	yes
 USE_GITHUB=	yes
@@ -89,11 +89,12 @@ GH_TUPLE+=	ceph:xxHash:1f40c65:xxHash/src/xxHash
 GH_TUPLE+=	facebook:zstd:f4340f4:zstd/src/zstd
 
 CMAKE_BUILD_TYPE=	Release
-CMAKE_ON=	WITH_SYSTEM_BOOST WITH_FUSE WITH_SYSTEM_NPM
-CMAKE_OFF=	WITH_BOOST_CONTEXT WITH_LTTNG WITH_BABELTRACE WITH_KRBD WITH_XFS \
-		WITH_SPDK WITH_RDMA WITH_LIBCEPHFS WITH_CEPHFS \
-		WITH_MGR_DASHBOARD_FRONTEND
-CMAKE_ARGS=	-D WITH_PYTHON2=OFF -D WITH_PYTHON3=3.7 -DMGR_PYTHON_VERSION=3.7 \
+CMAKE_ON=	WITH_SYSTEM_BOOST WITH_BOOST_CONTEXT WITH_FUSE WITH_PYTHON3
+CMAKE_OFF=	WITH_LTTNG WITH_BABELTRACE WITH_KRBD WITH_XFS \
+		WITH_SPDK WITH_RDMA WITH_RADOSGW_BEAST_FRONTEND \
+		WITH_MGR_DASHBOARD_FRONTEND WITH_SYSTEM_NPM \
+		WITH_LIBCEPHFS WITH_CEPHFS WITH_PYTHON2
+CMAKE_ARGS=	-D MGR_PYTHON_VERSION=${PYTHON_VER} \
 		-D CEPH_MAN_DIR:STRING=man
 
 SHEBANG_FILES=	src/rbdmap src/ceph-post-file.in src/rbd-replay-many \
diff --git a/net/ceph14/files/patch-cmake_modules_FindPython3Interp.cmake b/net/ceph14/files/patch-cmake_modules_FindPython3Interp.cmake
new file mode 100644
index 000000000000..7f3a0c534ef5
--- /dev/null
+++ b/net/ceph14/files/patch-cmake_modules_FindPython3Interp.cmake
@@ -0,0 +1,11 @@
+--- cmake/modules/FindPython3Interp.cmake.orig	2019-09-13 18:07:41 UTC
++++ cmake/modules/FindPython3Interp.cmake
+@@ -69,7 +69,7 @@
+ 
+ unset(_Python3_NAMES)
+ 
+-set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
++set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+ 
+ if(Python3Interp_FIND_VERSION)
+     if(Python3Interp_FIND_VERSION_COUNT GREATER 1)
diff --git a/net/ceph14/files/patch-cmake_modules_FindPython3Libs.cmake b/net/ceph14/files/patch-cmake_modules_FindPython3Libs.cmake
new file mode 100644
index 000000000000..2b5bda755fa4
--- /dev/null
+++ b/net/ceph14/files/patch-cmake_modules_FindPython3Libs.cmake
@@ -0,0 +1,11 @@
+--- cmake/modules/FindPython3Libs.cmake.orig	2019-09-13 18:07:41 UTC
++++ cmake/modules/FindPython3Libs.cmake
+@@ -101,7 +101,7 @@ endif()
+ # To avoid picking up the system Python.h pre-maturely.
+ set(CMAKE_FIND_FRAMEWORK LAST)
+ 
+-set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
++set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+ 
+ if(Python3Libs_FIND_VERSION)
+     if(Python3Libs_FIND_VERSION_COUNT GREATER 1)
diff --git a/net/ceph14/pkg-message b/net/ceph14/pkg-message
index 1b3b3a6a7372..e67e66410258 100644
--- a/net/ceph14/pkg-message
+++ b/net/ceph14/pkg-message
@@ -6,7 +6,8 @@ It comes with a web based dashboard that cannot be build
 into a package but will require the user to install it himself.
 
 To install the dashboard, please execute:
-    cd /usr/local/./share/ceph/mgr/dashboard/frontend
+    sudo pkg install npm
+    cd /usr/local/share/ceph/mgr/dashboard/frontend
     chown -R ceph .
     ls -asl /var/lib/ceph
     chown -R ceph:ceph /var/lib/ceph
diff --git a/net/ceph14/pkg-plist b/net/ceph14/pkg-plist
index 67cd575975a4..d63784b9ef67 100644
--- a/net/ceph14/pkg-plist
+++ b/net/ceph14/pkg-plist
@@ -125,33 +125,33 @@ lib/librgw_admin_user.so.1.0.0
 %%PYTHON_SITELIBDIR%%/ceph_volume-1.0.0-py%%PYTHON_VER%%.egg-info/not-zip-safe
 %%PYTHON_SITELIBDIR%%/ceph_volume-1.0.0-py%%PYTHON_VER%%.egg-info/top_level.txt
 %%PYTHON_SITELIBDIR%%/ceph_volume/__init__.py
-%%PYTHON_SITELIBDIR%%/ceph_volume/__pycache__/__init__.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/__pycache__/configuration.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/__pycache__/decorators.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/__pycache__/exceptions.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/__pycache__/log.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/__pycache__/main.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/__pycache__/process.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/__pycache__/terminal.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/__pycache__/configuration.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/__pycache__/decorators.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/__pycache__/exceptions.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/__pycache__/log.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/__pycache__/process.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/__pycache__/terminal.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ceph_volume/api/__init__.py
-%%PYTHON_SITELIBDIR%%/ceph_volume/api/__pycache__/__init__.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/api/__pycache__/lvm.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/api/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/api/__pycache__/lvm.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ceph_volume/api/lvm.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/configuration.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/decorators.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/devices/__init__.py
-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/__pycache__/__init__.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/devices/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__init__.py
-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/__init__.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/activate.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/batch.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/common.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/create.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/listing.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/main.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/prepare.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/trigger.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/zap.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/activate.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/batch.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/common.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/create.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/listing.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/prepare.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/trigger.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/zap.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/activate.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/batch.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/common.py
@@ -160,11 +160,11 @@ lib/librgw_admin_user.so.1.0.0
 %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/main.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/prepare.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/strategies/__init__.py
-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/strategies/__pycache__/__init__.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/strategies/__pycache__/bluestore.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/strategies/__pycache__/filestore.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/strategies/__pycache__/strategies.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/strategies/__pycache__/validators.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/strategies/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/strategies/__pycache__/bluestore.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/strategies/__pycache__/filestore.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/strategies/__pycache__/strategies.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/strategies/__pycache__/validators.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/strategies/bluestore.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/strategies/filestore.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/strategies/strategies.py
@@ -172,57 +172,57 @@ lib/librgw_admin_user.so.1.0.0
 %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/trigger.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/zap.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/devices/simple/__init__.py
-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/simple/__pycache__/__init__.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/simple/__pycache__/activate.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/simple/__pycache__/main.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/simple/__pycache__/scan.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/devices/simple/__pycache__/trigger.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/devices/simple/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/devices/simple/__pycache__/activate.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/devices/simple/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/devices/simple/__pycache__/scan.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/devices/simple/__pycache__/trigger.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ceph_volume/devices/simple/activate.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/devices/simple/main.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/devices/simple/scan.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/devices/simple/trigger.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/exceptions.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/inventory/__init__.py
-%%PYTHON_SITELIBDIR%%/ceph_volume/inventory/__pycache__/__init__.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/inventory/__pycache__/main.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/inventory/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/inventory/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ceph_volume/inventory/main.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/log.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/main.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/process.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/systemd/__init__.py
-%%PYTHON_SITELIBDIR%%/ceph_volume/systemd/__pycache__/__init__.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/systemd/__pycache__/main.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/systemd/__pycache__/systemctl.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/systemd/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/systemd/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/systemd/__pycache__/systemctl.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ceph_volume/systemd/main.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/systemd/systemctl.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/terminal.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/__pycache__/__init__.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/__pycache__/conftest.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/__pycache__/test_configuration.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/__pycache__/test_decorators.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/__pycache__/test_inventory.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/__pycache__/test_main.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/__pycache__/test_process.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/__pycache__/test_terminal.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/tests/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/tests/__pycache__/conftest.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/tests/__pycache__/test_configuration.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/tests/__pycache__/test_decorators.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/tests/__pycache__/test_inventory.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/tests/__pycache__/test_main.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/tests/__pycache__/test_process.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/tests/__pycache__/test_terminal.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ceph_volume/tests/conftest.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/__init__.py
-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/__pycache__/__init__.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/__pycache__/test_zap.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/__pycache__/test_zap.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__init__.py
-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/__init__.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_activate.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_batch.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_create.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_listing.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_prepare.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_trigger.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_zap.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_activate.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_batch.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_create.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_listing.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_prepare.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_trigger.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_zap.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/strategies/__init__.py
-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/strategies/__pycache__/__init__.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/strategies/__pycache__/test_bluestore.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/strategies/__pycache__/test_filestore.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/strategies/__pycache__/test_validate.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/strategies/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/strategies/__pycache__/test_bluestore.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/strategies/__pycache__/test_filestore.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/strategies/__pycache__/test_validate.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/strategies/test_bluestore.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/strategies/test_filestore.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/strategies/test_validate.py
@@ -241,15 +241,15 @@ lib/librgw_admin_user.so.1.0.0
 %%PYTHON_SITELIBDIR%%/ceph_volume/tests/test_process.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/tests/test_terminal.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/util/__init__.py
-%%PYTHON_SITELIBDIR%%/ceph_volume/util/__pycache__/__init__.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/util/__pycache__/arg_validators.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/util/__pycache__/constants.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/util/__pycache__/device.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/util/__pycache__/disk.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/util/__pycache__/encryption.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/util/__pycache__/prepare.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/util/__pycache__/system.cpython-37.pyc
-%%PYTHON_SITELIBDIR%%/ceph_volume/util/__pycache__/templates.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/util/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/util/__pycache__/arg_validators.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/util/__pycache__/constants.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/util/__pycache__/device.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/util/__pycache__/disk.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/util/__pycache__/encryption.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/util/__pycache__/prepare.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/util/__pycache__/system.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/util/__pycache__/templates.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ceph_volume/util/arg_validators.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/util/constants.py
 %%PYTHON_SITELIBDIR%%/ceph_volume/util/device.py