openstack/cyborg
Code Issues Proposed changes

add support for installing cyborg client

Browse Source 
This change adds support for installing the
python-cyborgclient from git. By default it is installed
but it can be disabled by setting CYBORG_CLIENT_INSTALL=False.
The version and repo can be set using CYBORG_CLIENT_REPO and
CYBORG_CLIENT_BRANCH.

Change-Id: I1dd616fe1e0c5b03118a23fc5afe2a4d3bb3686d
This commit is contained in:
Sean Mooney
2020-02-24 22:52:59 +00:00
parent dd2024ee95
commit 76bdd3f8a3
3 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
devstack/lib/cyborg
View File

@@ -52,6 +52,19 @@ function cleanup_agent {
fi fi
} }
function clone_cyborg_client {
if [[ "${CYBORG_CLIENT_INSTALL}" == "True" ]]; then
git_clone ${CYBORG_CLIENT_REPO} ${CYBORG_CLIENT_DIR} ${CYBORG_CLIENT_BRANCH}
fi
}
function install_cyborg_client {
if [[ "${CYBORG_CLIENT_INSTALL}" == "True" ]]; then
setup_develop ${CYBORG_CLIENT_DIR}
fi
}
# install_cyborg() - Install the things! # install_cyborg() - Install the things!
function install_cyborg { function install_cyborg {
# make sure all needed services are enabled # make sure all needed services are enabled

2
devstack/plugin.sh
View File

@@ -13,10 +13,12 @@ case $1 in
case $2 in case $2 in
"pre-install") "pre-install")
pre_install_agent pre_install_agent
clone_cyborg_client
;; ;;
"install") "install")
echo_summary "Installing Cyborg" echo_summary "Installing Cyborg"
install_cyborg install_cyborg
install_cyborg_client
;; ;;
"post-config") "post-config")
# stack/post-config - Called after the layer 0 and 2 services # stack/post-config - Called after the layer 0 and 2 services

6
devstack/settings
View File

@@ -49,3 +49,9 @@ OPAE_DEVEL_PKG=${OPAE_DEVEL_PKG:-"opae-devel"}
OPAE_DEVEL=${OPAE_DEVEL:-"${OPAE_DEVEL_PKG}-$OPAE_VERSION.x86_64"} OPAE_DEVEL=${OPAE_DEVEL:-"${OPAE_DEVEL_PKG}-$OPAE_VERSION.x86_64"}
OPAE_LIBS_PKG=${OPAE_LIBS_PKG:-"opae-libs"} OPAE_LIBS_PKG=${OPAE_LIBS_PKG:-"opae-libs"}
OPAE_LIBS=${OPAE_LIBS:-"${OPAE_LIBS_PKG}-$OPAE_VERSION.x86_64"} OPAE_LIBS=${OPAE_LIBS:-"${OPAE_LIBS_PKG}-$OPAE_VERSION.x86_64"}
# client settings
CYBORG_CLIENT_INSTALL=$(trueorfalse True CYBORG_CLIENT_INSTALL)
CYBORG_CLIENT_REPO=${CYBORG_CLIENT_REPO:-"$GIT_BASE/openstack/python-cyborgclient"}
CYBORG_CLIENT_BRANCH=${CYBORG_CLIENT_BRANCH:-master}
CYBORG_CLIENT_DIR="${DEST}/python-cyborgclient"