Browse code

Merge "Enroll Ironic nodes /w IRONIC_KEY_FILE"

Jenkins authored on 2015/01/10 12:42:15
Showing 1 changed files
... ...
@@ -536,7 +536,7 @@ function enroll_nodes {
536 536
             -i ssh_address=$IRONIC_VM_SSH_ADDRESS \
537 537
             -i ssh_port=$IRONIC_VM_SSH_PORT \
538 538
             -i ssh_username=$IRONIC_SSH_USERNAME \
539
-            -i ssh_key_filename=$IRONIC_SSH_KEY_DIR/$IRONIC_SSH_KEY_FILENAME"
539
+            -i ssh_key_filename=$IRONIC_KEY_FILE"
540 540
     else
541 541
         local ironic_node_cpu=$IRONIC_HW_NODE_CPU
542 542
         local ironic_node_ram=$IRONIC_HW_NODE_RAM