openstack/devstack
Code Issues Proposed changes

Merge "stack.sh fails for Cisco plugin with missing cisco_plugins.ini error"

Browse Source
This commit is contained in:
Jenkins 2014-05-10 12:24:16 +00:00 committed by Gerrit Code Review
commit 8cedabcea8
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/neutron_plugins/cisco
View File

@ -183,6 +183,15 @@ function neutron_plugin_configure_common {
ovs_neutron_plugin_configure_common
Q_PLUGIN_EXTRA_CONF_PATH=etc/neutron/plugins/cisco
Q_PLUGIN_EXTRA_CONF_FILES=(cisco_plugins.ini)
# Copy extra config files to /etc so that they can be modified
# later according to Cisco-specific localrc settings.
mkdir -p /$Q_PLUGIN_EXTRA_CONF_PATH
local f
local extra_conf_file
for (( f=0; $f < ${#Q_PLUGIN_EXTRA_CONF_FILES[@]}; f+=1 )); do
extra_conf_file=$Q_PLUGIN_EXTRA_CONF_PATH/${Q_PLUGIN_EXTRA_CONF_FILES[$f]}
cp $NEUTRON_DIR/$extra_conf_file /$extra_conf_file
done
else
Q_PLUGIN_CONF_PATH=etc/neutron/plugins/cisco
Q_PLUGIN_CONF_FILENAME=cisco_plugins.ini