openstack
/
devstack-gate
Code Issues Proposed changes

use setlc_raw to inject DEVSTACK_LOCAL_CONFIG into files 

This was actually a suggestion on the way to do this originally, and
it helps with the fact that we don't have to deal with bash handling
of line endings.

Change-Id: Ie64b9a20adccdb19352a6cc8fa402acc4c3f5e5b
This commit is contained in:
Sean Dague 2017-02-23 10:45:41 -05:00
parent 0ef46186dd
commit b9154881aa
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devstack-vm-gate.sh
View File

@ -559,21 +559,15 @@ function setup_localrc {
# If we are in a multinode environment, we may want to specify 2
# different sets of plugins
if [[ -n "$DEVSTACK_SUBNODE_CONFIG" ]]; then
echo "[[local|localrc]]" > /tmp/ds-subnode-localrc
echo $DEVSTACK_SUBNODE_CONFIG >> /tmp/ds-subnode-localrc
$DSCONF merge_lc "$localrc_file" /tmp/ds-subnode-localrc
$DSCONF setlc_raw "$localrc_file" "$DEVSTACK_SUBNODE_CONFIG"
else
if [[ -n "$DEVSTACK_LOCAL_CONFIG" ]]; then
echo "[[local|localrc]]" > /tmp/ds-localrc
echo $DEVSTACK_LOCAL_CONFIG >> /tmp/ds-localrc
$DSCONF merge_lc "$localrc_file" /tmp/ds-localrc
$DSCONF setlc_raw "$localrc_file" "$DEVSTACK_LOCAL_CONFIG"
fi
fi
else
if [[ -n "$DEVSTACK_LOCAL_CONFIG" ]]; then
echo "[[local|localrc]]" > /tmp/ds-localrc
echo $DEVSTACK_LOCAL_CONFIG >> /tmp/ds-localrc
$DSCONF merge_lc "$localrc_file" /tmp/ds-localrc
$DSCONF setlc_raw "$localrc_file" "$DEVSTACK_LOCAL_CONFIG"
fi
fi