commit a41ad4d183f77145cef283fc4d3da118211f8a0a
author Jenkins <jenkins@review.openstack.org> Mon Jan 12 03:39:12 2015 +0000
committer Gerrit Code Review <review@openstack.org> Mon Jan 12 03:39:12 2015 +0000
tree 0b5c1469a17b7acb8334222856c5773333da2bad
parent 69ef526ac9fbb83c9b6e0cf6d5fc6e65f20fcf54
parent b968b0c36b09b8b5df860d5334e175ec75a838f6

Merge "Fix comments to use 'local.conf' instead of 'localrc'"

functions-common

diff --git a/functions-common b/functions-common
index 56106b3..7a6c3a1 100644
--- a/functions-common
+++ b/functions-common
@@ -1803,6 +1803,9 @@
 function run_plugins {
     local mode=$1
     local phase=$2
+
+    local plugins="${DEVSTACK_PLUGINS}"
+    local plugin
     for plugin in ${plugins//,/ }; do
         local dir=${GITDIR[$plugin]}
         if [[ -f $dir/devstack/plugin.sh ]]; then

lib/ironic

diff --git a/lib/ironic b/lib/ironic
index 3f7ae21..55272b9 100644
--- a/lib/ironic
+++ b/lib/ironic
@@ -536,7 +536,7 @@
             -i ssh_address=$IRONIC_VM_SSH_ADDRESS \
             -i ssh_port=$IRONIC_VM_SSH_PORT \
             -i ssh_username=$IRONIC_SSH_USERNAME \
-            -i ssh_key_filename=$IRONIC_SSH_KEY_DIR/$IRONIC_SSH_KEY_FILENAME"
+            -i ssh_key_filename=$IRONIC_KEY_FILE"
     else
         local ironic_node_cpu=$IRONIC_HW_NODE_CPU
         local ironic_node_ram=$IRONIC_HW_NODE_RAM