openstack/manila
Code Issues Proposed changes

Make Manila UI be installed after Horizon

Browse Source 
Recent devstack change [1] made Horizon be installed at later point than it
was. It is inconsistent with our Devstack plugin that now installs Manila UI
earlier than Horizon. So, postpone installation of Manila UI until Horizon
exists and fix gates by this action.

[1] I8bf2ceaf7734c4f7cec68bc05d7cdbae81ef311e

Change-Id: Icb2fc77235cb7f6ec4349dacddf262c3e3be76c2
Closes-Bug: #1532300
This commit is contained in:
vponomaryov 2016-01-08 22:51:32 +02:00
parent 42ca76e4f1
commit 08e2a666bc
1 changed files with 7 additions and 7 deletions

14
devstack/plugin.sh

@ -196,17 +196,14 @@ function configure_manila {
MANILA_CONFIGURE_GROUPS=${MANILA_CONFIGURE_GROUPS:-"$MANILA_ENABLED_BACKENDS"}
set_config_opts $MANILA_CONFIGURE_GROUPS
set_config_opts DEFAULT
if is_service_enabled horizon && [ "$MANILA_UI_ENABLED" = "True" ]; then
configure_manila_ui
fi
}
function configure_manila_ui {
setup_develop $MANILA_UI_DIR
cp $MANILA_UI_DIR/manila_ui/enabled/_90_manila_*.py $HORIZON_DIR/openstack_dashboard/local/enabled
if is_service_enabled horizon && [ "$MANILA_UI_ENABLED" = "True" ]; then
setup_develop $MANILA_UI_DIR
cp $MANILA_UI_DIR/manila_ui/enabled/_90_manila_*.py $HORIZON_DIR/openstack_dashboard/local/enabled
fi
}
@ -477,6 +474,9 @@ elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
echo_summary "Update Tempest config"
update_tempest
echo_summary "Configuring Manila UI"
configure_manila_ui
fi
if [[ "$1" == "unstack" ]]; then