Refactoring Manila GlusterFS job definitions
This patch modifies the Manila GlusterFS job definitions to use devstack-plugin-glusterfs plugin specific pre_test_hook.sh and post_test_hook.sh scripts. Change-Id: I3b285a7b7007e6017b174ad1fd69b5f4cbb2f202
This commit is contained in:
parent
d8fbad629c
commit
2c328a756a
@ -418,7 +418,17 @@
|
||||
# Configure devstack-plugin-glusterfs to enable GlusterFS as a backend for Manila.
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"CONFIGURE_GLUSTERFS_MANILA=True"
|
||||
|
||||
# Configure devstack-plugin-glusterfs to use glusterfs-native driver.
|
||||
# Configure devstack-plugin-glusterfs to disable GlusterFS as a backend for Cinder.
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"CONFIGURE_GLUSTERFS_CINDER=False"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"CINDER_ENABLED_BACKENDS=lvm:lvmdriver-1"
|
||||
|
||||
# Configure devstack-plugin-glusterfs to disable GlusterFS as a backend for Nova.
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"CONFIGURE_GLUSTERFS_NOVA=False"
|
||||
|
||||
# Configure devstack-plugin-glusterfs to disable GlusterFS as a backend for Glance.
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"CONFIGURE_GLUSTERFS_GLANCE=False"
|
||||
|
||||
# Configure devstack-plugin-glusterfs to use glusterfs-nfs driver.
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"GLUSTERFS_MANILA_DRIVER_TYPE=glusterfs"
|
||||
|
||||
# Keep localrc to be able to set some vars in pre_test_hook
|
||||
@ -426,13 +436,13 @@
|
||||
|
||||
function pre_test_hook {
|
||||
# Configure devstack to run manila installation without handling of share servers
|
||||
source $BASE/new/manila/contrib/ci/pre_test_hook.sh False
|
||||
source $BASE/new/devstack-plugin-glusterfs/devstack/pre_test_hook.sh
|
||||
}
|
||||
export -f pre_test_hook
|
||||
|
||||
function post_test_hook {
|
||||
# Configure and run tempest on singlebackend manila installation
|
||||
source $BASE/new/manila/contrib/ci/post_test_hook.sh singlebackend
|
||||
source $BASE/new/devstack-plugin-glusterfs/devstack/post_test_hook.sh singlebackend
|
||||
}
|
||||
export -f post_test_hook
|
||||
|
||||
@ -481,6 +491,16 @@
|
||||
# Configure devstack-plugin-glusterfs to enable GlusterFS as a backend for Manila.
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"CONFIGURE_GLUSTERFS_MANILA=True"
|
||||
|
||||
# Configure devstack-plugin-glusterfs to disable GlusterFS as a backend for Cinder.
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"CONFIGURE_GLUSTERFS_CINDER=False"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"CINDER_ENABLED_BACKENDS=lvm:lvmdriver-1"
|
||||
|
||||
# Configure devstack-plugin-glusterfs to disable GlusterFS as a backend for Nova.
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"CONFIGURE_GLUSTERFS_NOVA=False"
|
||||
|
||||
# Configure devstack-plugin-glusterfs to disable GlusterFS as a backend for Glance.
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"CONFIGURE_GLUSTERFS_GLANCE=False"
|
||||
|
||||
# Configure devstack-plugin-glusterfs to use glusterfs-native driver.
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"GLUSTERFS_MANILA_DRIVER_TYPE=glusterfs-native"
|
||||
|
||||
@ -489,13 +509,13 @@
|
||||
|
||||
function pre_test_hook {
|
||||
# Configure devstack to run manila installation without handling of share servers
|
||||
source $BASE/new/manila/contrib/ci/pre_test_hook.sh False
|
||||
source $BASE/new/devstack-plugin-glusterfs/devstack/pre_test_hook.sh
|
||||
}
|
||||
export -f pre_test_hook
|
||||
|
||||
function post_test_hook {
|
||||
# Configure and run tempest on singlebackend manila installation
|
||||
source $BASE/new/manila/contrib/ci/post_test_hook.sh singlebackend
|
||||
source $BASE/new/devstack-plugin-glusterfs/devstack/post_test_hook.sh singlebackend
|
||||
}
|
||||
export -f post_test_hook
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user