From 54ac1f39a743b6697c8781e481edaa7371d82dbd Mon Sep 17 00:00:00 2001 From: Tom Barron Date: Mon, 27 Feb 2017 13:05:17 -0500 Subject: [PATCH] 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-hdfs-ubuntu-xenial-nv Change-Id: Iabeab500908149a65e221b8b98c7b50a4af5b3e6 --- manila/pre_test_hook.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/manila/pre_test_hook.sh b/manila/pre_test_hook.sh index 6ebc33f..9543c20 100755 --- a/manila/pre_test_hook.sh +++ b/manila/pre_test_hook.sh @@ -14,21 +14,23 @@ # This script is executed inside pre_test_hook function in devstack gate. -localrc_path=$BASE/new/devstack/localrc -echo "DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=1" >> $localrc_path -echo "API_RATE_LIMIT=False" >> $localrc_path -echo "TEMPEST_SERVICES+=,manila" >> $localrc_path +localconf=$BASE/new/devstack/local.conf -echo "MANILA_USE_DOWNGRADE_MIGRATIONS=True" >> $localrc_path +echo "[[local|localrc]]" >> $localconf +echo "DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=1" >> $localconf +echo "API_RATE_LIMIT=False" >> $localconf +echo "TEMPEST_SERVICES+=,manila" >> $localconf + +echo "MANILA_USE_DOWNGRADE_MIGRATIONS=True" >> $localconf # NOTE(vponomaryov): enable following only for 'scenario' tests if such added. -echo "MANILA_SERVICE_IMAGE_ENABLED=False" >> $localrc_path +echo "MANILA_SERVICE_IMAGE_ENABLED=False" >> $localconf # Enabling isolated metadata in Neutron is required because # Tempest creates isolated networks and created vm's in scenario tests don't # have access to Nova Metadata service. This leads to unavailability of # created vm's 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 # incompatibilities for plugin stored in Manila repo.