manila: use local.conf in pre_test_hook script
As per, http://lists.openstack.org/pipermail/openstack-dev/2017-February/112872.html a devstack plugin's pre_test_hook script can set options in local.conf and not in localrc. Do so to unblock gate, gate-manila-tempest-dsvm-cephfs-native Closes-bug: #1668197 Change-Id: Ic426935f0c5c5aa66fddf496b6b97350ec56b5e5
This commit is contained in:
parent
3ece1cd96d
commit
9c59965cd6
|
@ -37,27 +37,30 @@ MANILA_CEPH_DRIVER=${MANILA_CEPH_DRIVER:-cephfsnative}
|
||||||
# 'singlebackend' or 'multiplebackend'.
|
# 'singlebackend' or 'multiplebackend'.
|
||||||
MANILA_BACKEND_TYPE=$3
|
MANILA_BACKEND_TYPE=$3
|
||||||
MANILA_BACKEND_TYPE=${MANILA_BACKEND_TYPE:-singlebackend}
|
MANILA_BACKEND_TYPE=${MANILA_BACKEND_TYPE:-singlebackend}
|
||||||
|
|
||||||
|
localconf=$BASE/new/devstack/local.conf
|
||||||
|
|
||||||
|
echo "[[local|localrc]]" >> $localconf
|
||||||
if [[ $MANILA_BACKEND_TYPE == 'multibackend' ]]; then
|
if [[ $MANILA_BACKEND_TYPE == 'multibackend' ]]; then
|
||||||
echo "MANILA_MULTI_BACKEND=True" >> $localrc_path
|
echo "MANILA_MULTI_BACKEND=True" >> $localconf
|
||||||
elif [[ $MANILA_BACKEND_TYPE == 'singlebackend' ]]; then
|
elif [[ $MANILA_BACKEND_TYPE == 'singlebackend' ]]; then
|
||||||
echo "MANILA_MULTI_BACKEND=False" >> $localrc_path
|
echo "MANILA_MULTI_BACKEND=False" >> $localconf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
localrc_path=$BASE/new/devstack/localrc
|
echo "DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=1" >> $localconf
|
||||||
echo "DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=1" >> $localrc_path
|
echo "API_RATE_LIMIT=False" >> $localconf
|
||||||
echo "API_RATE_LIMIT=False" >> $localrc_path
|
echo "TEMPEST_SERVICES+=,manila" >> $localconf
|
||||||
echo "TEMPEST_SERVICES+=,manila" >> $localrc_path
|
echo "MANILA_USE_DOWNGRADE_MIGRATIONS=True" >> $localconf
|
||||||
echo "MANILA_USE_DOWNGRADE_MIGRATIONS=True" >> $localrc_path
|
|
||||||
|
|
||||||
|
|
||||||
# NOTE(rraja): Enable when need arises, for example, when the CI does scenario
|
# NOTE(rraja): Enable when need arises, for example, when the CI does scenario
|
||||||
# testing.
|
# testing.
|
||||||
echo "MANILA_SERVICE_IMAGE_ENABLED=False" >> $localrc_path
|
echo "MANILA_SERVICE_IMAGE_ENABLED=False" >> $localconf
|
||||||
|
|
||||||
# Enable isolated metadata in Neutron because Tempest creates isolated
|
# Enable isolated metadata in Neutron because Tempest creates isolated
|
||||||
# networks and created VMs in scenario tests don't have access to Nova Metadata
|
# networks and created VMs in scenario tests don't have access to Nova Metadata
|
||||||
# service. This leads to unavailability of created VMs in scenario tests.
|
# service. This leads to unavailability of created VMs in scenario tests.
|
||||||
echo 'ENABLE_ISOLATED_METADATA=True' >> $localrc_path
|
echo 'ENABLE_ISOLATED_METADATA=True' >> $localconf
|
||||||
|
|
||||||
# Go to Tempest dir and checkout stable commit to avoid possible
|
# Go to Tempest dir and checkout stable commit to avoid possible
|
||||||
# incompatibilities for plugin stored in Manila repo.
|
# incompatibilities for plugin stored in Manila repo.
|
||||||
|
|
Loading…
Reference in New Issue