openstack
/
freezer-web-ui
Code Issues Proposed changes

fixed incorrect directory install freezer-web-ui 

Fixed incorrect install DEST when install freezer-web-ui.

Remove the freezer-client install in devstack.

Change-Id: I1d9b463ea668d2649904d1e7f94fb8a5ad7fb072
Closes-Bug: #1552759
This commit is contained in:
Jin Nan Zhang 2016-03-03 15:38:25 -05:00
parent e74af2a026
commit 2d0e1bd479
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devstack/lib/freezer-web-ui
View File

@ -41,7 +41,8 @@ function cleanup_freezer_web_ui {
# executed during: stack install
function install_freezer_web_ui {
if is_service_enabled horizon; then
sudo -H -E pip install -e git+${FREEZER_WEB_UI_REPO}@${FREEZER_WEB_UI_BRANCH}#egg=freezer_web_ui-origin_${FREEZER_WEB_UI_BRANCH}
git_clone $FREEZER_WEB_UI_REPO $FREEZER_WEB_DIR $FREEZER_WEB_UI_BRANCH
setup_develop $FREEZER_API_DIR
else
echo "Horizon dashboard disabled. Freezer Web UI will not be installed"
fi
@ -81,10 +82,5 @@ function stop_freezer_web_ui {
}
function install_freezer_client {
sudo -H -E pip install -e git+${FREEZER_CLIENT_REPO}@${FREEZER_CLIENT_BRANCH}#egg=freezer-origin_${FREEZER_CLIENT_BRANCH}
}
# Restore xtrace
$XTRACE

3
devstack/plugin.sh
View File

@ -21,7 +21,6 @@ if is_service_enabled freezer-web-ui; then
if [[ "$1" == "stack" && "$2" == "install" ]]; then
echo_summary "Installing Freezer Web UI"
install_freezer_client
install_freezer_web_ui
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
echo_summary "Configuring Freezer Web UI"
@ -39,4 +38,4 @@ if is_service_enabled freezer-web-ui; then
if [[ "$1" == "clean" ]]; then
cleanup_freezer_web_ui
fi
fi
fi

9
devstack/settings
View File

@ -23,10 +23,5 @@ FREEZER_WEB_UI_FILES=${FREEZER_WEB_UI_DIR}/devstack/files
FREEZER_WEB_UI_REPO=${FREEZER_WEB_UI_REPO:-${GIT_BASE}/openstack/freezer-web-ui.git}
FREEZER_WEB_UI_BRANCH=${FREEZER_WEB_UI_BRANCH:-master}
# Freezer client
FREEZER_CLIENT_REPO=${FREEZER_CLIENT_REPO:-${GIT_BASE}/openstack/freezer.git}
FREEZER_CLIENT_DIR=$DEST/freezer
FREEZER_CLIENT_BRANCH=${FREEZER_CLIENT_BRANCH:-master}
enable_service freezer-web-ui freezer-client
# Enable freezer-web-ui
enable_service freezer-web-ui