openstack/neutron
Code Issues Proposed changes

Match load_rc_for_rally logic to load_rc_hook

Browse Source 
This makes the rally extras loading logic compatible
with devstack-gate and unblocks the rally job.

Closes-Bug: #1714901
Change-Id: I80c9a155ee2b52558109c764075a58dfabee44d4
(cherry picked from commit 07ddb11685)
This commit is contained in:
Kevin Benton 2017-09-04 03:24:48 -07:00 committed by Ihar Hrachyshka
parent 188f5c29a9
commit 63acf41ee8
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/tests/contrib/gate_hook.sh
View File

@ -44,7 +44,12 @@ function load_conf_hook {
# Tweak gate configuration for our rally scenarios
function load_rc_for_rally {
for file in $(ls $RALLY_EXTRA_DIR/*.setup); do
$DSCONF merge_lc $LOCAL_CONF $file
tmpfile=$(tempfile)
config=$(cat $file)
echo "[[local|localrc]]" > $tmpfile
$DSCONF setlc_raw $tmpfile "$config"
$DSCONF merge_lc $LOCAL_CONF $tmpfile
rm -f $tmpfile
done
}