summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-13 11:15:10 +0000
committerGerrit Code Review <review@openstack.org>2016-12-13 11:15:10 +0000
commitd2bdd58febb0d1443b582047d7899303c9d59522 (patch)
treeeee5c799024c657c59ea652acf4120c4f2524c75
parentf2c2366e04981ff8b944eafd2398f484607e1c8a (diff)
parent4d36064cbaf83751a496fcf32c9e1ca0ec3e9176 (diff)
Merge "Decouple Manila UI from Manila Devstack plugin"4.0.0.0b2
-rwxr-xr-xdevstack/plugin.sh31
-rw-r--r--devstack/settings5
2 files changed, 4 insertions, 32 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index b80bf82..5489eb5 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -259,22 +259,6 @@ function configure_manila {
259} 259}
260 260
261 261
262function configure_manila_ui {
263 if is_service_enabled horizon && [ "$MANILA_UI_ENABLED" = "True" ]; then
264 # NOTE(vponomaryov): workaround for devstack bug: 1540328
265 # where devstack install 'test-requirements' but should not do it
266 # for manila-ui project as it installs Horizon from url.
267 # Remove following two 'mv' commands when mentioned bug is fixed.
268 mv $MANILA_UI_DIR/test-requirements.txt $MANILA_UI_DIR/_test-requirements.txt
269
270 setup_develop $MANILA_UI_DIR
271 cp $MANILA_UI_DIR/manila_ui/enabled/_90_manila_*.py $HORIZON_DIR/openstack_dashboard/local/enabled
272
273 mv $MANILA_UI_DIR/_test-requirements.txt $MANILA_UI_DIR/test-requirements.txt
274 fi
275}
276
277
278function create_manila_service_keypair { 262function create_manila_service_keypair {
279 if is_service_enabled nova; then 263 if is_service_enabled nova; then
280 local keypair_exists=$( openstack keypair list | grep " $MANILA_SERVICE_KEYPAIR_NAME " ) 264 local keypair_exists=$( openstack keypair list | grep " $MANILA_SERVICE_KEYPAIR_NAME " )
@@ -710,10 +694,6 @@ function install_manila {
710 fi 694 fi
711 fi 695 fi
712 696
713 # install manila-ui if horizon is enabled
714 if is_service_enabled horizon && [ "$MANILA_UI_ENABLED" = "True" ]; then
715 git_clone $MANILA_UI_REPO $MANILA_UI_DIR $MANILA_UI_BRANCH
716 fi
717} 697}
718 698
719#configure_samba - Configure node as Samba server 699#configure_samba - Configure node as Samba server
@@ -750,11 +730,6 @@ function configure_samba {
750 730
751# start_manila - Start running processes, including screen 731# start_manila - Start running processes, including screen
752function start_manila { 732function start_manila {
753 # restart apache to reload running horizon if manila-ui is enabled
754 if is_service_enabled horizon && [ "$MANILA_UI_ENABLED" = "True" ]; then
755 restart_apache_server
756 sleep 3 # Wait for 3 sec to ensure that apache is running
757 fi
758 733
759 run_process m-api "$MANILA_BIN_DIR/manila-api --config-file $MANILA_CONF" 734 run_process m-api "$MANILA_BIN_DIR/manila-api --config-file $MANILA_CONF"
760 run_process m-shr "$MANILA_BIN_DIR/manila-share --config-file $MANILA_CONF" 735 run_process m-shr "$MANILA_BIN_DIR/manila-share --config-file $MANILA_CONF"
@@ -936,8 +911,10 @@ elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
936 echo_summary "Creating Manila custom share types" 911 echo_summary "Creating Manila custom share types"
937 create_custom_share_types 912 create_custom_share_types
938 913
939 echo_summary "Configuring Manila UI" 914 echo_summary "Manila UI is no longer enabled by default. \
940 configure_manila_ui 915 Add enable_plugin manila-ui github.com/openstack/manila-ui \
916 to your local.conf file to enable Manila UI"
917
941elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then 918elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
942 echo_summary "Update Tempest config" 919 echo_summary "Update Tempest config"
943 update_tempest 920 update_tempest
diff --git a/devstack/settings b/devstack/settings
index 2f0315d..07c7565 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -36,16 +36,11 @@ MANILA_REPO_ROOT=${MANILA_REPO_ROOT:-openstack}
36MANILACLIENT_REPO=${MANILA_GIT_BASE}/${MANILA_REPO_ROOT}/python-manilaclient.git 36MANILACLIENT_REPO=${MANILA_GIT_BASE}/${MANILA_REPO_ROOT}/python-manilaclient.git
37MANILACLIENT_BRANCH=${MANILACLIENT_BRANCH:-master} 37MANILACLIENT_BRANCH=${MANILACLIENT_BRANCH:-master}
38 38
39MANILA_UI_REPO=${MANILA_GIT_BASE}/${MANILA_REPO_ROOT}/manila-ui.git
40MANILA_UI_BRANCH=${MANILA_UI_BRANCH:-$MANILACLIENT_BRANCH}
41MANILA_UI_ENABLED=$(trueorfalse True MANILA_UI_ENABLED)
42
43# Set up default directories 39# Set up default directories
44MANILA_DIR=${MANILA_DIR:=$DEST/manila} 40MANILA_DIR=${MANILA_DIR:=$DEST/manila}
45MANILA_LOCK_PATH=${MANILA_LOCK_PATH:=$OSLO_LOCK_PATH} 41MANILA_LOCK_PATH=${MANILA_LOCK_PATH:=$OSLO_LOCK_PATH}
46MANILA_LOCK_PATH=${MANILA_LOCK_PATH:=$MANILA_DIR/manila_locks} 42MANILA_LOCK_PATH=${MANILA_LOCK_PATH:=$MANILA_DIR/manila_locks}
47MANILACLIENT_DIR=${MANILACLIENT_DIR:=$DEST/python-manilaclient} 43MANILACLIENT_DIR=${MANILACLIENT_DIR:=$DEST/python-manilaclient}
48MANILA_UI_DIR=${MANILA_UI_DIR:=$DEST/manila-ui}
49MANILA_STATE_PATH=${MANILA_STATE_PATH:=$DATA_DIR/manila} 44MANILA_STATE_PATH=${MANILA_STATE_PATH:=$DATA_DIR/manila}
50MANILA_AUTH_CACHE_DIR=${MANILA_AUTH_CACHE_DIR:-/var/cache/manila} 45MANILA_AUTH_CACHE_DIR=${MANILA_AUTH_CACHE_DIR:-/var/cache/manila}
51 46