openstack/devstack
Code Issues Proposed changes

devstack (stack.sh) fails when extra config files are specified

Browse Source 
Latest merge of https://review.openstack.org/#/c/71996/ exposes an issue
in stack.sh which did not surface before.

Please see the details of the issue in the bug description.

Closes bug: 1285884

Change-Id: Ie231c9835497c2a418a61d339dfd5df1aab9e3d7
This commit is contained in:
sukhdev 2014-02-27 14:17:44 -08:00
parent 0ed4af02da
commit c03f975150
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/neutron
View File

@ -586,11 +586,9 @@ function _configure_neutron_common() {
# If additional config files exist, copy them over to neutron configuration # If additional config files exist, copy them over to neutron configuration
# directory # directory
if [[ $Q_PLUGIN_EXTRA_CONF_PATH != '' ]]; then if [[ $Q_PLUGIN_EXTRA_CONF_PATH != '' ]]; then
mkdir -p /$Q_PLUGIN_EXTRA_CONF_PATH
local f local f
for (( f=0; $f < ${#Q_PLUGIN_EXTRA_CONF_FILES[@]}; f+=1 )); do for (( f=0; $f < ${#Q_PLUGIN_EXTRA_CONF_FILES[@]}; f+=1 )); do
Q_PLUGIN_EXTRA_CONF_FILES[$f]=$Q_PLUGIN_EXTRA_CONF_PATH/${Q_PLUGIN_EXTRA_CONF_FILES[$f]} Q_PLUGIN_EXTRA_CONF_FILES[$f]=$Q_PLUGIN_EXTRA_CONF_PATH/${Q_PLUGIN_EXTRA_CONF_FILES[$f]}
cp $NEUTRON_DIR/${Q_PLUGIN_EXTRA_CONF_FILES[$f]} /${Q_PLUGIN_EXTRA_CONF_FILES[$f]}
done done
fi fi