From 3164551e3fd8421c3e26476d716bbe2605c86aa1 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Mon, 10 Dec 2018 14:36:47 +0100 Subject: [PATCH] ceph-volume: Add venv to vstart cmake target Adds new add_custom_target `ceph-volume-venv-setup` that creates a virtual environment, and calls `python setup.py develop` Signed-off-by: Sebastian Wagner --- src/CMakeLists.txt | 4 ++++ src/ceph-volume/CMakeLists.txt | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6e729edb91c..6d7a00afe46 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -756,6 +756,10 @@ if(WITH_MGR AND WITH_MGR_DASHBOARD_FRONTEND AND CMAKE_SYSTEM_PROCESSOR MATCHES " add_dependencies(vstart mgr-dashboard-frontend-build) endif() +if(WITH_MGR) + add_dependencies(vstart ceph-volume-venv-setup) +endif() + # Everything you need to run CephFS tests add_custom_target(cephfs_testing DEPENDS vstart diff --git a/src/ceph-volume/CMakeLists.txt b/src/ceph-volume/CMakeLists.txt index d49a9bfca34..e09fdefe03c 100644 --- a/src/ceph-volume/CMakeLists.txt +++ b/src/ceph-volume/CMakeLists.txt @@ -7,3 +7,22 @@ if(FREEBSD) add_subdirectory(plugin/zfs) endif() +# Required for running ceph-volume inventory in a vstart environment +set(CEPH_VOLUME_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-volume-virtualenv) + +add_custom_command( + OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/python + COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${PYTHON_EXECUTABLE} ${CEPH_VOLUME_VIRTUALENV} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume + COMMENT "ceph-volume venv is being created") + +add_custom_command( + OUTPUT ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume + DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/python + COMMAND . ${CEPH_VOLUME_VIRTUALENV}/bin/activate && ${CEPH_VOLUME_VIRTUALENV}/bin/python setup.py develop && deactivate + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-volume + COMMENT "${CMAKE_SOURCE_DIR}/src/ceph-volume") + +add_custom_target(ceph-volume-venv-setup + DEPENDS ${CEPH_VOLUME_VIRTUALENV}/bin/ceph-volume) + -- 2.39.5