Browse code

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

Jenkins authored on 2014/05/10 21:24:16
Showing 1 changed files
... ...
@@ -183,6 +183,15 @@ function neutron_plugin_configure_common {
183 183
         ovs_neutron_plugin_configure_common
184 184
         Q_PLUGIN_EXTRA_CONF_PATH=etc/neutron/plugins/cisco
185 185
         Q_PLUGIN_EXTRA_CONF_FILES=(cisco_plugins.ini)
186
+        # Copy extra config files to /etc so that they can be modified
187
+        # later according to Cisco-specific localrc settings.
188
+        mkdir -p /$Q_PLUGIN_EXTRA_CONF_PATH
189
+        local f
190
+        local extra_conf_file
191
+        for (( f=0; $f < ${#Q_PLUGIN_EXTRA_CONF_FILES[@]}; f+=1 )); do
192
+            extra_conf_file=$Q_PLUGIN_EXTRA_CONF_PATH/${Q_PLUGIN_EXTRA_CONF_FILES[$f]}
193
+            cp $NEUTRON_DIR/$extra_conf_file /$extra_conf_file
194
+        done
186 195
     else
187 196
         Q_PLUGIN_CONF_PATH=etc/neutron/plugins/cisco
188 197
         Q_PLUGIN_CONF_FILENAME=cisco_plugins.ini