openstack
/
cue
Code Issues Proposed changes

fix for horizon/devstack issue 

As of pip 8.x installing from external links is not allowed when
constraints are enforced, this is causing cue-dashboard
installation to fail because cue-dashboard is pulling in
horizon as an external link as part of test-requirements.

Since test requirements won't be needed during devstack gate
testing, cue-dashboard/test-requirements.txt is being shuffled
around to avoid installing cue-dashboard/test-requirements.  This
follows the approach that Manila uses in
I841b56f65b50e9c5673cc02e93b4329ed29125ba

Change-Id: I29524df86146762aac5430efafaf7a02b705f539
This commit is contained in:
Min Pae 2016-03-03 13:37:33 -08:00
parent 6657a8aa5c
commit ea98738844
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/plugin.sh
View File

@ -397,6 +397,7 @@ function install_cuedashboard {
if is_service_enabled horizon; then
git_clone $CUEDASHBOARD_REPO $CUEDASHBOARD_DIR $CUEDASHBOARD_BRANCH
mv $CUEDASHBOARD_DIR/test-requirements.txt $CUEDASHBOARD_DIR/_test-requirements.txt
setup_develop $CUEDASHBOARD_DIR
if ! [ -h $DEST/horizon/openstack_dashboard/local/enabled/_70_cue_panel_group.py ]; then
@ -405,6 +406,7 @@ function install_cuedashboard {
if ! [ -h $DEST/horizon/openstack_dashboard/local/enabled/_71_cue_panel.py ]; then
ln -s $DEST/cue-dashboard/_71_cue_panel.py $DEST/horizon/openstack_dashboard/local/enabled/_71_cue_panel.py
fi
mv $CUEDASHBOARD_DIR/_test-requirements.txt $CUEDASHBOARD_DIR/test-requirements.txt
fi
}