openstack/venus-dashboard
Code Issues Proposed changes

Use venus clinet

Browse Source 
Insert venusclient into requirements.txt

Change-Id: I0e50b65fb30f797b39cac067167ac3c0a3043685
This commit is contained in:
baiziyu 2022-09-09 18:25:27 +08:00
parent 0ea27a4244
commit 827386f5ae
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
devstack/plugin.sh
View File

@ -10,23 +10,6 @@ function configure_venus_dashboard {
cp -a ${VENUS_DASHBOARD_DIR}/venus_dashboard/enabled/* ${HORIZON_DIR}/openstack_dashboard/local/enabled/ cp -a ${VENUS_DASHBOARD_DIR}/venus_dashboard/enabled/* ${HORIZON_DIR}/openstack_dashboard/local/enabled/
} }
function install_venus_client {
VENUSCLINET_REPO="https://review.opendev.org/openstack/python-venusclient"
VENUSCLIENT_BRANCH="master"
VENUSCLIENT_DIR="${VENUS_DASHBOARD_DIR}/python-venusclient"
if [[ ! -d $VENUSCLIENT_DIR ]]; then
git_clone $VENUSCLINET_REPO $VENUSCLIENT_DIR $VENUSCLIENT_BRANCH
mv ${VENUSCLIENT_DIR}/venusclient ${VENUS_DASHBOARD_DIR}/venusclient
rm -rf ${VENUSCLIENT_DIR}
fi
}
function remove_venus_client {
rm -rf ${VENUS_DASHBOARD_DIR}/venusclient
}
function init_venus_dashboard { function init_venus_dashboard {
$PYTHON ${DEST}/horizon/manage.py collectstatic --noinput $PYTHON ${DEST}/horizon/manage.py collectstatic --noinput
$PYTHON ${DEST}/horizon/manage.py compress --force $PYTHON ${DEST}/horizon/manage.py compress --force
@ -44,7 +27,6 @@ if is_service_enabled venus-dashboard; then
# Perform installation of service source # Perform installation of service source
echo_summary "Installing Venus Dashboard" echo_summary "Installing Venus Dashboard"
install_venus_dashboard install_venus_dashboard
install_venus_client
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
# Configure after the other layer 1 and 2 services have been configured # Configure after the other layer 1 and 2 services have been configured
@ -60,7 +42,8 @@ if is_service_enabled venus-dashboard; then
if [[ "$1" == "unstack" ]]; then if [[ "$1" == "unstack" ]]; then
# Shut down venus-dashboard services # Shut down venus-dashboard services
remove_venus_client # no-op
:
fi fi
if [[ "$1" == "clean" ]]; then if [[ "$1" == "clean" ]]; then

2
requirements.txt
View File

@ -21,4 +21,4 @@ XStatic-lodash>=4.16.4.1 # MIT License
XStatic-moment>=2.8.4.1 # MIT License XStatic-moment>=2.8.4.1 # MIT License
XStatic-Moment-Timezone>=0.5.22.0 # MIT License XStatic-Moment-Timezone>=0.5.22.0 # MIT License
XStatic-smart-table>=1.4.13.2 # MIT License XStatic-smart-table>=1.4.13.2 # MIT License
# python-venusclient>=2.5.0 # Apache-2.0 python-venusclient>=1.0.0 # Apache-2.0 License