From d39d930274ee78ef55720a8719c91a8eb7303bc7 Mon Sep 17 00:00:00 2001 From: Goutham Pacha Ravi Date: Mon, 29 Jul 2019 17:10:49 -0700 Subject: [PATCH] Make manila-tempest-plugin installation optional manila-tempest-plugin can be installed with its devstack plugin; Installing it via manila's plugin is unnecessary. So, deprecate its installation in the DevStack plugin. This change is being backported to the stable branches to allow Zuulv3 style jobs to eventually be supported on these branches. Without this change, installation of manila will fail on Zuulv3 jobs with the error: 'The /opt/stack/manila-tempest-plugin project was not found; if this is a gate job, add the project to the $PROJECTS variable in the job definition.' die 563 'Cloning not allowed in this configuration' If manila-tempest-plugin is added to $PROJECTS as suggested, we'll end up double cloning this project, once via its devstack plugin and once in manila's own devstack plugin. Change-Id: I21c08069ff82b3bfb52ef7ac960183ddc866c2ee (cherry picked from commit 8d03a2a46e233b3628ffe59af67c1feb789e1669) Signed-off-by: Goutham Pacha Ravi --- contrib/ci/pre_test_hook.sh | 2 ++ devstack/plugin.sh | 13 +++++++++++-- devstack/settings | 5 +++++ playbooks/legacy/grenade-dsvm-manila/run.yaml | 2 ++ .../run.yaml | 2 ++ .../run.yaml | 3 +++ .../run.yaml | 2 ++ .../run.yaml | 3 +++ .../manila-tempest-dsvm-glusterfs-native/run.yaml | 3 +++ .../run.yaml | 3 +++ .../manila-tempest-dsvm-glusterfs-nfs/run.yaml | 3 +++ playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml | 3 +++ .../manila-tempest-dsvm-mysql-generic/run.yaml | 2 ++ .../manila-tempest-dsvm-postgres-container/run.yaml | 2 ++ .../run.yaml | 2 ++ .../run.yaml | 2 ++ .../legacy/manila-tempest-dsvm-scenario/run.yaml | 2 ++ .../run.yaml | 3 ++- .../run.yaml | 3 ++- .../run.yaml | 3 ++- .../manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml | 4 +++- .../manila-tempest-minimal-dsvm-dummy/run.yaml | 2 ++ .../legacy/manila-tempest-minimal-dsvm-lvm/run.yaml | 2 ++ .../run.yaml | 2 +- .../run.yaml | 2 +- 25 files changed, 67 insertions(+), 8 deletions(-) diff --git a/contrib/ci/pre_test_hook.sh b/contrib/ci/pre_test_hook.sh index 81f54f317f..f5e977082b 100755 --- a/contrib/ci/pre_test_hook.sh +++ b/contrib/ci/pre_test_hook.sh @@ -45,6 +45,8 @@ echo "MANILA_BACKEND2_CONFIG_GROUP_NAME=paris" >> $localconf echo "MANILA_SHARE_BACKEND1_NAME=LONDON" >> $localconf echo "MANILA_SHARE_BACKEND2_NAME=PARIS" >> $localconf +echo "MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=${MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE:=True}" >> $localconf + # === Handle script arguments === # First argument is expected to be a boolean-like value for DHSS. DHSS=$1 diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 6ef6451128..f1c0015192 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -1237,8 +1237,17 @@ elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then fi ########################################################################### - echo_summary "Fetching and installing manila-tempest-plugin system-wide" - install_manila_tempest_plugin + + if [ $(trueorfalse False MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE) == True ]; then + echo_summary "Fetching and installing manila-tempest-plugin system-wide" + install_manila_tempest_plugin + export DEPRECATED_TEXT="$DEPRECATED_TEXT\nInstalling + manila-tempest-plugin can be done with the help of its own DevStack + plugin by adding: \n\n\t'enable_plugin manila-tempest-plugin + https://opendev.org/openstack/manila-tempest-plugin'.\n\nManila's + DevStack plugin will stop installing it automatically." + fi + echo_summary "Update Tempest config" update_tempest fi diff --git a/devstack/settings b/devstack/settings index 0a2c86ad78..999d35c1e2 100644 --- a/devstack/settings +++ b/devstack/settings @@ -211,6 +211,11 @@ MANILA_DATA_COPY_CHECK_HASH=${MANILA_DATA_COPY_CHECK_HASH:=True} # Manila IPv6 Setup flag MANILA_SETUP_IPV6=${MANILA_SETUP_IPV6:=False} +# Install manila-tempest-plugin system-wide +# This operation has been deprecated. manila-tempest-plugin has a devstack +# plugin that must be preferred over this approach. +MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=${MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE:=True} + # Enable manila services # ---------------------- # We have to add Manila to enabled services for screen_it to work diff --git a/playbooks/legacy/grenade-dsvm-manila/run.yaml b/playbooks/legacy/grenade-dsvm-manila/run.yaml index d28b3e8f35..fc0195d24c 100644 --- a/playbooks/legacy/grenade-dsvm-manila/run.yaml +++ b/playbooks/legacy/grenade-dsvm-manila/run.yaml @@ -35,6 +35,8 @@ export DEVSTACK_GATE_TEMPEST_NOTESTS=1 export DEVSTACK_GATE_GRENADE=pullup + export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False + # Basic services needed for grenade manila job using dummy driver export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit diff --git a/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml b/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml index 99c185602a..418576f572 100644 --- a/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml @@ -31,6 +31,7 @@ cat << 'EOF' >>"/tmp/dg-local.conf" [[local|localrc]] enable_plugin manila https://opendev.org/openstack/manila + enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin EOF executable: /bin/bash @@ -50,6 +51,7 @@ export PROJECTS="openstack/manila-image-elements $PROJECTS" export ENABLED_SERVICES=tempest + export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False # Keep localrc to be able to set some vars in pre_test_hook export KEEP_LOCALRC=1 diff --git a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml index 4204c8375c..57594409ea 100644 --- a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml @@ -30,6 +30,7 @@ cat << 'EOF' >>"/tmp/dg-local.conf" [[local|localrc]] enable_plugin manila https://opendev.org/openstack/manila + enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin EOF executable: /bin/bash @@ -51,6 +52,8 @@ export KEEP_LOCALRC=1 export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" + export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False + function pre_test_hook { # 'dhss' - acronym for 'Driver Handles Share Servers', # defines mode of a share driver. Boolean-like. diff --git a/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml index e87e180837..70a6324e95 100644 --- a/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml @@ -31,6 +31,7 @@ cat << 'EOF' >>"/tmp/dg-local.conf" [[local|localrc]] enable_plugin manila https://opendev.org/openstack/manila + enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin EOF executable: /bin/bash @@ -50,6 +51,7 @@ export PROJECTS="openstack/manila-image-elements $PROJECTS" export ENABLED_SERVICES=tempest + export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False # Keep localrc to be able to set some vars in pre_test_hook export KEEP_LOCALRC=1 diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml index a9ebf82c0e..be5f447ecd 100644 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml @@ -30,6 +30,8 @@ cat << 'EOF' >>"/tmp/dg-local.conf" [[local|localrc]] enable_plugin manila https://opendev.org/openstack/manila + enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin + # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS. enable_plugin devstack-plugin-glusterfs https://opendev.org/x/devstack-plugin-glusterfs @@ -57,6 +59,7 @@ # Keep localrc to be able to set some vars in pre_test_hook export KEEP_LOCALRC=1 export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" + export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False function pre_test_hook { # Configure devstack to run manila installation without handling of share servers diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml index 2aaa691893..75a80bd515 100644 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml @@ -30,6 +30,8 @@ cat << 'EOF' >>"/tmp/dg-local.conf" [[local|localrc]] enable_plugin manila https://opendev.org/openstack/manila + enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin + # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS. enable_plugin devstack-plugin-glusterfs https://opendev.org/x/devstack-plugin-glusterfs @@ -57,6 +59,7 @@ # Keep localrc to be able to set some vars in pre_test_hook export KEEP_LOCALRC=1 export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" + export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False function pre_test_hook { # Configure devstack to run manila installation without handling of share servers diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml index 7b8de69467..cf62df51d2 100644 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml @@ -31,6 +31,8 @@ cat << 'EOF' >>"/tmp/dg-local.conf" [[local|localrc]] enable_plugin manila https://opendev.org/openstack/manila + enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin + # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS. enable_plugin devstack-plugin-glusterfs https://opendev.org/x/devstack-plugin-glusterfs @@ -58,6 +60,7 @@ # Keep localrc to be able to set some vars in pre_test_hook export KEEP_LOCALRC=1 export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" + export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False function pre_test_hook { # Configure devstack to run manila installation without handling of share servers diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml index e9b088b133..ffe121fb52 100644 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml @@ -30,6 +30,8 @@ cat << 'EOF' >>"/tmp/dg-local.conf" [[local|localrc]] enable_plugin manila https://opendev.org/openstack/manila + enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin + # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS. enable_plugin devstack-plugin-glusterfs https://opendev.org/x/devstack-plugin-glusterfs @@ -57,6 +59,7 @@ # Keep localrc to be able to set some vars in pre_test_hook export KEEP_LOCALRC=1 + export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False function pre_test_hook { # Configure devstack to run manila installation without handling of share servers diff --git a/playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml b/playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml index aa83ef4f76..4863f065db 100644 --- a/playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml @@ -30,6 +30,8 @@ cat << 'EOF' >>"/tmp/dg-local.conf" [[local|localrc]] enable_plugin manila https://opendev.org/openstack/manila + enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin + # Enable devstack-plugin-hdfs plugin, to install and configure HDFS. enable_plugin devstack-plugin-hdfs https://opendev.org/x/devstack-plugin-hdfs @@ -51,6 +53,7 @@ # Keep localrc to be able to set some vars in pre_test_hook export KEEP_LOCALRC=1 export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" + export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False function pre_test_hook { # Configure devstack to run manila installation without handling of share servers diff --git a/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml b/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml index 47610fd3dc..c2faa28e65 100644 --- a/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml @@ -30,6 +30,7 @@ cat << 'EOF' >>"/tmp/dg-local.conf" [[local|localrc]] enable_plugin manila https://opendev.org/openstack/manila + enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin EOF executable: /bin/bash @@ -50,6 +51,7 @@ # Keep localrc to be able to set some vars in pre_test_hook export KEEP_LOCALRC=1 export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" + export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False function pre_test_hook { # 'dhss' - acronym for 'Driver Handles Share Servers', diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml index e72c18ebf8..63d9d4c77e 100644 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml @@ -30,6 +30,7 @@ cat << 'EOF' >>"/tmp/dg-local.conf" [[local|localrc]] enable_plugin manila https://opendev.org/openstack/manila + enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin EOF executable: /bin/bash @@ -50,6 +51,7 @@ # Keep localrc to be able to set some vars in pre_test_hook export KEEP_LOCALRC=1 export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" + export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False function pre_test_hook { # 'dhss' - acronym for 'Driver Handles Share Servers', diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml index 2da247f3c9..0d53f5ed00 100644 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml @@ -30,6 +30,7 @@ cat << 'EOF' >>"/tmp/dg-local.conf" [[local|localrc]] enable_plugin manila https://opendev.org/openstack/manila + enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin EOF executable: /bin/bash @@ -50,6 +51,7 @@ # Keep localrc to be able to set some vars in pre_test_hook export KEEP_LOCALRC=1 export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" + export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False function pre_test_hook { # 'dhss' - acronym for 'Driver Handles Share Servers', diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml index e2fa824bf2..fdb96726a4 100644 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml @@ -30,6 +30,7 @@ cat << 'EOF' >>"/tmp/dg-local.conf" [[local|localrc]] enable_plugin manila https://opendev.org/openstack/manila + enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin EOF executable: /bin/bash @@ -50,6 +51,7 @@ # Keep localrc to be able to set some vars in pre_test_hook export KEEP_LOCALRC=1 export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" + export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False function pre_test_hook { # 'dhss' - acronym for 'Driver Handles Share Servers', diff --git a/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml b/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml index 73c32e458c..9f21a02afb 100644 --- a/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml @@ -30,6 +30,7 @@ cat << 'EOF' >>"/tmp/dg-local.conf" [[local|localrc]] enable_plugin manila https://opendev.org/openstack/manila + enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin EOF executable: /bin/bash @@ -50,6 +51,7 @@ # Keep localrc to be able to set some vars in pre_test_hook export KEEP_LOCALRC=1 export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" + export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False function pre_test_hook { # 'dhss' - acronym for 'Driver Handles Share Servers', diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml index b41ee56869..820e722c41 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml @@ -64,7 +64,7 @@ [[local|localrc]] SKIP_EPEL_INSTALL=True enable_plugin manila https://opendev.org/openstack/manila - + enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph # Enable CephFS as the backend for Manila. @@ -101,6 +101,7 @@ export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" export KEEP_LOCALRC=1 export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" + export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest export OVERRIDE_ENABLED_SERVICES diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/run.yaml index 996e3331fd..fd06ec5c59 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/run.yaml @@ -30,7 +30,7 @@ cat << 'EOF' >>"/tmp/dg-local.conf" [[local|localrc]] enable_plugin manila https://opendev.org/openstack/manila - + enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph # Enable CephFS as the backend for Manila. @@ -70,6 +70,7 @@ OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest export OVERRIDE_ENABLED_SERVICES + export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False export DEVSTACK_GATE_USE_PYTHON3=True function pre_test_hook { diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml index 7b90b3afe5..bbe7a5cd2a 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml @@ -64,7 +64,7 @@ [[local|localrc]] SKIP_EPEL_INSTALL=True enable_plugin manila https://opendev.org/openstack/manila - + enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph # Enable CephFS as the backend for Manila. @@ -101,6 +101,7 @@ export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" export KEEP_LOCALRC=1 export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" + export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest export OVERRIDE_ENABLED_SERVICES diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml index 2c227ce085..ff8597ef04 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml @@ -30,7 +30,7 @@ cat << 'EOF' >>"/tmp/dg-local.conf" [[local|localrc]] enable_plugin manila https://opendev.org/openstack/manila - + enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph # Enable CephFS as the backend for Manila. @@ -65,6 +65,8 @@ export ENABLED_SERVICES=tempest export PROJECTS="openstack/devstack-plugin-ceph $PROJECTS" export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" + export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False + export KEEP_LOCALRC=1 export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml index 8c2593022b..c58082b1d2 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml @@ -30,6 +30,7 @@ cat << 'EOF' >>"/tmp/dg-local.conf" [[local|localrc]] enable_plugin manila https://opendev.org/openstack/manila + enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin EOF executable: /bin/bash @@ -52,6 +53,7 @@ # Keep localrc to be able to set some vars in pre_test_hook export KEEP_LOCALRC=1 export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" + export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False function pre_test_hook { # 'dhss' - acronym for 'Driver Handles Share Servers', diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml index 56ec3506c1..5c12cc5bd3 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml @@ -31,6 +31,7 @@ [[local|localrc]] SKIP_EPEL_INSTALL=True enable_plugin manila https://opendev.org/openstack/manila + enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing enable_plugin neutron-tempest-plugin https://opendev.org/openstack/neutron-tempest-plugin EOF @@ -48,6 +49,7 @@ export MANILA_SETUP_IPV6=True export RUN_MANILA_IPV6_TESTS=True + export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False # Basic services needed for minimal job OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest diff --git a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml index 27e5f2e9c8..99093cd7b3 100644 --- a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml @@ -45,7 +45,7 @@ disable_service s-proxy enable_plugin manila https://opendev.org/openstack/manila - + enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph # Enable CephFS as the backend for Manila. diff --git a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml index b4811d1a64..fc9281c13d 100644 --- a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml @@ -45,7 +45,7 @@ disable_service s-proxy enable_plugin manila https://opendev.org/openstack/manila - + enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph # Enable CephFS as the backend for Manila.