openstack
/
senlin
Code Issues Proposed changes

Fix senlin-dashboard install 

When setting up tempest gate for senlin api test, we are currently
running git-clone on senlin-dashboard. It is unnecessary and it is
rejected by devstack. This patch propose a separate path for develop
setup of senlin-dashboard. Hopefully, it will not impact any production
setup while it leaves us some room for getting tempest gate up asap.

Change-Id: I314cf2e01e889a8c19fa819090ceacb98ee885eb
This commit is contained in:
tengqm 2016-05-25 21:38:14 -04:00
parent 20bf39ee8d
commit 028342cba9
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devstack/lib/senlin
View File

@ -161,12 +161,14 @@ function install_senlin_dashboard {
# where devstack install 'test-requirements' but should not do it
# for senlin-dashboard project as it installs Horizon from url.
# Remove following two 'mv' commands when mentioned bug is fixed.
git_clone $SENLIN_DASHBOARD_REPO $SENLIN_DASHBOARD_DIR $SENLIN_DASHBOARD_BRANCH
mv $SENLIN_DASHBOARD_DIR/test-requirements.txt $SENLIN_DASHBOARD_DIR/_test-requirements.txt
setup_develop $SENLIN_DASHBOARD_DIR
mv $SENLIN_DASHBOARD_DIR/_test-requirements.txt $SENLIN_DASHBOARD_DIR/test-requirements.txt
if use_library_from_git "senlin-dashboard"; then
git_clone $SENLIN_DASHBOARD_REPO $SENLIN_DASHBOARD_DIR $SENLIN_DASHBOARD_BRANCH
mv $SENLIN_DASHBOARD_DIR/test-requirements.txt $SENLIN_DASHBOARD_DIR/_test-requirements.txt
setup_develop $SENLIN_DASHBOARD_DIR
mv $SENLIN_DASHBOARD_DIR/_test-requirements.txt $SENLIN_DASHBOARD_DIR/test-requirements.txt
else
pip_install senlin-dashboard
fi
}
# configure_senlin_dashboard() - Set config files