Browse Source

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-glusterfs-*

Change-Id: Ia7c5ffeeff7e8cb86153f565b7b74f7e67b11a03
Tom Barron 2 years ago
parent
commit
99a3d82609
1 changed files with 11 additions and 9 deletions
  1. 11
    9
      manila/pre_test_hook.sh

+ 11
- 9
manila/pre_test_hook.sh View File

@@ -14,14 +14,16 @@
14 14
 
15 15
 # This script is executed inside pre_test_hook function in devstack gate.
16 16
 
17
-localrc_path=$BASE/new/devstack/localrc
18
-echo "DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=1" >> $localrc_path
19
-echo "API_RATE_LIMIT=False" >> $localrc_path
20
-echo "TEMPEST_SERVICES+=,manila" >> $localrc_path
17
+localconf=$BASE/new/devstack/local.conf
21 18
 
22
-echo "MANILA_USE_DOWNGRADE_MIGRATIONS=True" >> $localrc_path
23
-echo "MANILA_SERVICE_IMAGE_ENABLED=False" >> $localrc_path
24
-echo "MANILA_MULTI_BACKEND=False" >> $localrc_path
19
+echo "[[local|localrc]]" >> $localconf
20
+echo "DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=1" >> $localconf
21
+echo "API_RATE_LIMIT=False" >> $localconf
22
+echo "TEMPEST_SERVICES+=,manila" >> $localconf
23
+
24
+echo "MANILA_USE_DOWNGRADE_MIGRATIONS=True" >> $localconf
25
+echo "MANILA_SERVICE_IMAGE_ENABLED=False" >> $localconf
26
+echo "MANILA_MULTI_BACKEND=False" >> $localconf
25 27
 
26 28
 # Import env vars defined in CI job.
27 29
 for env_var in ${DEVSTACK_LOCAL_CONFIG// / }; do
@@ -35,14 +37,14 @@ done
35 37
 # ends with "glusterfs".
36 38
 case "$GLUSTERFS_MANILA_DRIVER_TYPE" in
37 39
 glusterfs|glusterfs-nfs)
38
-    echo "MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS='snapshot_support=False'" >> $localrc_path
40
+    echo "MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS='snapshot_support=False'" >> $localconf
39 41
 esac
40 42
 
41 43
 # Enabling isolated metadata in Neutron is required because
42 44
 # Tempest creates isolated networks and created vm's in scenario tests don't
43 45
 # have access to Nova Metadata service. This leads to unavailability of
44 46
 # created vm's in scenario tests.
45
-echo 'ENABLE_ISOLATED_METADATA=True' >> $localrc_path
47
+echo 'ENABLE_ISOLATED_METADATA=True' >> $localconf
46 48
 
47 49
 # Go to Tempest dir and checkout stable commit to avoid possible
48 50
 # incompatibilities for plugin stored in Manila repo.

Loading…
Cancel
Save