From 4d36064cbaf83751a496fcf32c9e1ca0ec3e9176 Mon Sep 17 00:00:00 2001 From: Victoria Martinez de la Cruz Date: Wed, 19 Oct 2016 15:23:58 -0300 Subject: [PATCH] Decouple Manila UI from Manila Devstack plugin Whereas the bug report associated to this fix is about Manila UI not working, this fix addresses more than this. On the first place, it decouples Manila UI from Manila Devstack plugin. This is a desired change since not every Manila user needs to work with the UI, and it doesn't make sense to have Manila UI bits on the Manila code if we can place all Manila UI related code on the Manila UI repo and, in this case, Manila UI Devstack plugin. This patch-set removes all the traces of Manila UI setup from the Manila Devstack plugin. Manila UI Devstack plugin was added in 457249be7ab3849b3479b96077a411ca37c37a95. And, secondly, it fixes Manila UI deploy with Devstack. Enabling manila-ui plugin on Devstack properly sets the UI component for Manila. Change-Id: I7a3372371e25c69d3df6d395c703a6412750effd Closes-Bug: #1570033 --- devstack/plugin.sh | 31 ++++--------------------------- devstack/settings | 5 ----- 2 files changed, 4 insertions(+), 32 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index b80bf82070..5489eb5ffe 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -259,22 +259,6 @@ function configure_manila { } -function configure_manila_ui { - if is_service_enabled horizon && [ "$MANILA_UI_ENABLED" = "True" ]; then - # NOTE(vponomaryov): workaround for devstack bug: 1540328 - # where devstack install 'test-requirements' but should not do it - # for manila-ui project as it installs Horizon from url. - # Remove following two 'mv' commands when mentioned bug is fixed. - mv $MANILA_UI_DIR/test-requirements.txt $MANILA_UI_DIR/_test-requirements.txt - - setup_develop $MANILA_UI_DIR - cp $MANILA_UI_DIR/manila_ui/enabled/_90_manila_*.py $HORIZON_DIR/openstack_dashboard/local/enabled - - mv $MANILA_UI_DIR/_test-requirements.txt $MANILA_UI_DIR/test-requirements.txt - fi -} - - function create_manila_service_keypair { if is_service_enabled nova; then local keypair_exists=$( openstack keypair list | grep " $MANILA_SERVICE_KEYPAIR_NAME " ) @@ -710,10 +694,6 @@ function install_manila { fi fi - # install manila-ui if horizon is enabled - if is_service_enabled horizon && [ "$MANILA_UI_ENABLED" = "True" ]; then - git_clone $MANILA_UI_REPO $MANILA_UI_DIR $MANILA_UI_BRANCH - fi } #configure_samba - Configure node as Samba server @@ -750,11 +730,6 @@ function configure_samba { # start_manila - Start running processes, including screen function start_manila { - # restart apache to reload running horizon if manila-ui is enabled - if is_service_enabled horizon && [ "$MANILA_UI_ENABLED" = "True" ]; then - restart_apache_server - sleep 3 # Wait for 3 sec to ensure that apache is running - fi run_process m-api "$MANILA_BIN_DIR/manila-api --config-file $MANILA_CONF" run_process m-shr "$MANILA_BIN_DIR/manila-share --config-file $MANILA_CONF" @@ -936,8 +911,10 @@ elif [[ "$1" == "stack" && "$2" == "extra" ]]; then echo_summary "Creating Manila custom share types" create_custom_share_types - echo_summary "Configuring Manila UI" - configure_manila_ui + echo_summary "Manila UI is no longer enabled by default. \ + Add enable_plugin manila-ui github.com/openstack/manila-ui \ + to your local.conf file to enable Manila UI" + elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then echo_summary "Update Tempest config" update_tempest diff --git a/devstack/settings b/devstack/settings index 2f0315dc7d..07c7565840 100644 --- a/devstack/settings +++ b/devstack/settings @@ -36,16 +36,11 @@ MANILA_REPO_ROOT=${MANILA_REPO_ROOT:-openstack} MANILACLIENT_REPO=${MANILA_GIT_BASE}/${MANILA_REPO_ROOT}/python-manilaclient.git MANILACLIENT_BRANCH=${MANILACLIENT_BRANCH:-master} -MANILA_UI_REPO=${MANILA_GIT_BASE}/${MANILA_REPO_ROOT}/manila-ui.git -MANILA_UI_BRANCH=${MANILA_UI_BRANCH:-$MANILACLIENT_BRANCH} -MANILA_UI_ENABLED=$(trueorfalse True MANILA_UI_ENABLED) - # Set up default directories MANILA_DIR=${MANILA_DIR:=$DEST/manila} MANILA_LOCK_PATH=${MANILA_LOCK_PATH:=$OSLO_LOCK_PATH} MANILA_LOCK_PATH=${MANILA_LOCK_PATH:=$MANILA_DIR/manila_locks} MANILACLIENT_DIR=${MANILACLIENT_DIR:=$DEST/python-manilaclient} -MANILA_UI_DIR=${MANILA_UI_DIR:=$DEST/manila-ui} MANILA_STATE_PATH=${MANILA_STATE_PATH:=$DATA_DIR/manila} MANILA_AUTH_CACHE_DIR=${MANILA_AUTH_CACHE_DIR:-/var/cache/manila}