From 195276bfaa28afd317619ca6612e89263c8dbf3e 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) (cherry picked from commit d39d930274ee78ef55720a8719c91a8eb7303bc7) 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 | 4 +++- .../run.yaml | 3 ++- .../manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml | 4 +++- .../manila-tempest-minimal-dsvm-dummy/run.yaml | 2 ++ .../run.yaml | 2 ++ .../run.yaml | 2 +- .../run.yaml | 2 +- 25 files changed, 68 insertions(+), 8 deletions(-) diff --git a/contrib/ci/pre_test_hook.sh b/contrib/ci/pre_test_hook.sh index 0bdd39420a..dba8af3c51 100755 --- a/contrib/ci/pre_test_hook.sh +++ b/contrib/ci/pre_test_hook.sh @@ -40,6 +40,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 ae783f4472..7918af2ce0 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -1158,8 +1158,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 b789b1f59c..5ed191cc88 100644 --- a/devstack/settings +++ b/devstack/settings @@ -198,6 +198,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 fce7fa56e4..2f10dda51f 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 d0f99b6acc..7e88d23c20 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 @@ -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 @@ -52,6 +53,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 0d20c007ca..66968d83b5 100644 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-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-native/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml index ef5e2f95ac..dc633cfddc 100644 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/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-heketi/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml index 91cfbb67dc..d0ae23fb1f 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 54ac936dcd..e78a4d4975 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 472d2dcdb0..c3590a38ff 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 9d2efaf914..ca0cc1e2a5 100644 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-postgres-container/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 @@ -51,6 +52,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 0d3a73f4d2..6b6a4de71a 100644 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/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 @@ -51,6 +52,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 05babfa01d..39c9d03247 100644 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/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 @@ -51,6 +52,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 d5bfded998..947caa1145 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 031083d95a..d0d5b3065b 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 @@ -65,7 +65,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. @@ -102,6 +102,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 4140aa8878..a20f874b33 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,8 @@ OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest export OVERRIDE_ENABLED_SERVICES + export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False + function pre_test_hook { # Configure Manila with a CephFS Native or NFS driver backend. # Refer to job-template pre_test_hook for more details on the 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 70bf18c968..9e7f3c7547 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 @@ -65,7 +65,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. @@ -102,6 +102,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 a0d963fe08..38e6575cf5 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 8a5a94388e..c8f8e4646a 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 @@ -63,6 +64,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-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml index 73bea06896..e2c73500ad 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml @@ -39,6 +39,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 @@ -82,6 +83,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 d10b6c7bed..ed96428583 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 @@ -46,7 +46,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 cf8d7a17c8..1894c6a880 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 @@ -46,7 +46,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.