Browse Source

Merge "Decouple Manila UI from Manila Devstack plugin"

Jenkins 2 years ago
parent
commit
d2bdd58feb
2 changed files with 4 additions and 32 deletions
  1. 4
    27
      devstack/plugin.sh
  2. 0
    5
      devstack/settings

+ 4
- 27
devstack/plugin.sh View File

@@ -259,22 +259,6 @@ function configure_manila {
259 259
 }
260 260
 
261 261
 
262
-function 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
-
278 262
 function create_manila_service_keypair {
279 263
     if is_service_enabled nova; then
280 264
         local keypair_exists=$( openstack keypair list | grep " $MANILA_SERVICE_KEYPAIR_NAME " )
@@ -710,10 +694,6 @@ function install_manila {
710 694
         fi
711 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 699
 #configure_samba - Configure node as Samba server
@@ -750,11 +730,6 @@ function configure_samba {
750 730
 
751 731
 # start_manila - Start running processes, including screen
752 732
 function 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 734
     run_process m-api "$MANILA_BIN_DIR/manila-api --config-file $MANILA_CONF"
760 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 911
     echo_summary "Creating Manila custom share types"
937 912
     create_custom_share_types
938 913
 
939
-    echo_summary "Configuring Manila UI"
940
-    configure_manila_ui
914
+    echo_summary "Manila UI is no longer enabled by default. \
915
+        Add enable_plugin manila-ui github.com/openstack/manila-ui \
916
+        to your local.conf file to enable Manila UI"
917
+
941 918
 elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
942 919
     echo_summary "Update Tempest config"
943 920
     update_tempest

+ 0
- 5
devstack/settings View File

@@ -36,16 +36,11 @@ MANILA_REPO_ROOT=${MANILA_REPO_ROOT:-openstack}
36 36
 MANILACLIENT_REPO=${MANILA_GIT_BASE}/${MANILA_REPO_ROOT}/python-manilaclient.git
37 37
 MANILACLIENT_BRANCH=${MANILACLIENT_BRANCH:-master}
38 38
 
39
-MANILA_UI_REPO=${MANILA_GIT_BASE}/${MANILA_REPO_ROOT}/manila-ui.git
40
-MANILA_UI_BRANCH=${MANILA_UI_BRANCH:-$MANILACLIENT_BRANCH}
41
-MANILA_UI_ENABLED=$(trueorfalse True MANILA_UI_ENABLED)
42
-
43 39
 # Set up default directories
44 40
 MANILA_DIR=${MANILA_DIR:=$DEST/manila}
45 41
 MANILA_LOCK_PATH=${MANILA_LOCK_PATH:=$OSLO_LOCK_PATH}
46 42
 MANILA_LOCK_PATH=${MANILA_LOCK_PATH:=$MANILA_DIR/manila_locks}
47 43
 MANILACLIENT_DIR=${MANILACLIENT_DIR:=$DEST/python-manilaclient}
48
-MANILA_UI_DIR=${MANILA_UI_DIR:=$DEST/manila-ui}
49 44
 MANILA_STATE_PATH=${MANILA_STATE_PATH:=$DATA_DIR/manila}
50 45
 MANILA_AUTH_CACHE_DIR=${MANILA_AUTH_CACHE_DIR:-/var/cache/manila}
51 46
 

Loading…
Cancel
Save