openstack/manila
Code Issues Proposed changes

Make manila-tempest-plugin installation optional

Browse Source 
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.

Change-Id: I21c08069ff82b3bfb52ef7ac960183ddc866c2ee
This commit is contained in:
Goutham Pacha Ravi 2019-07-29 17:10:49 -07:00
parent cc830350f9
commit 8d03a2a46e
24 changed files with 57 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/ci/pre_test_hook.sh
View File

@ -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

13
devstack/plugin.sh
View File

@ -1252,8 +1252,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

5
devstack/settings
View File

@ -212,6 +212,11 @@ MANILA_DATA_COPY_CHECK_HASH=${MANILA_DATA_COPY_CHECK_HASH:=True}
MANILA_SETUP_IPV6=${MANILA_SETUP_IPV6:=False}
MANILA_RESTORE_IPV6_DEFAULT_ROUTE=${MANILA_RESTORE_IPV6_DEFAULT_ROUTE:=True}
# 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

2
playbooks/legacy/grenade-dsvm-manila/run.yaml
View File

@ -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

2
playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml
View File

@ -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

3
playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml
View File

@ -31,6 +31,7 @@
[[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
chdir: '{{ ansible_user_dir }}/workspace'
@ -53,6 +54,8 @@
export DEVSTACK_GATE_USE_PYTHON3=True
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.

2
playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml
View File

@ -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

3
playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml
View File

@ -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

3
playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml
View File

@ -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

3
playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml
View File

@ -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

3
playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml
View File

@ -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

3
playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml
View File

@ -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

1
playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml
View File

@ -50,6 +50,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
export DEVSTACK_GATE_USE_PYTHON3=True

1
playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml
View File

@ -50,6 +50,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
export DEVSTACK_GATE_USE_PYTHON3=True

1
playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml
View File

@ -50,6 +50,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
export DEVSTACK_GATE_USE_PYTHON3=True

1
playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml
View File

@ -50,6 +50,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
export DEVSTACK_GATE_USE_PYTHON3=True

1
playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml
View File

@ -50,6 +50,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
export DEVSTACK_GATE_USE_PYTHON3=True

2
playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml
View File

@ -64,6 +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
@ -101,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

2
playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/run.yaml
View File

@ -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
enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph
@ -70,6 +71,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 {

2
playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml
View File

@ -64,6 +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
@ -101,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

1
playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml
View File

@ -65,6 +65,7 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
export MANILA_SETUP_IPV6=True
export RUN_MANILA_IPV6_TESTS=True

1
playbooks/legacy/manila-tempest-minimal-dsvm-dummy-py2/run.yaml
View File

@ -49,6 +49,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',

1
playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml
View File

@ -49,6 +49,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
export DEVSTACK_GATE_USE_PYTHON3=True

1
playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml
View File

@ -49,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