Browse code

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

Jenkins authored on 2014/03/04 10:13:06
Showing 1 changed files
... ...
@@ -586,11 +586,9 @@ function _configure_neutron_common {
586 586
     # If additional config files exist, copy them over to neutron configuration
587 587
     # directory
588 588
     if [[ $Q_PLUGIN_EXTRA_CONF_PATH != '' ]]; then
589
-        mkdir -p /$Q_PLUGIN_EXTRA_CONF_PATH
590 589
         local f
591 590
         for (( f=0; $f < ${#Q_PLUGIN_EXTRA_CONF_FILES[@]}; f+=1 )); do
592 591
             Q_PLUGIN_EXTRA_CONF_FILES[$f]=$Q_PLUGIN_EXTRA_CONF_PATH/${Q_PLUGIN_EXTRA_CONF_FILES[$f]}
593
-            cp $NEUTRON_DIR/${Q_PLUGIN_EXTRA_CONF_FILES[$f]} /${Q_PLUGIN_EXTRA_CONF_FILES[$f]}
594 592
         done
595 593
     fi
596 594