Merge "Enroll Ironic nodes /w IRONIC_KEY_FILE"

This commit is contained in:
Jenkins 2015-01-10 03:42:15 +00:00 committed by Gerrit Code Review
commit 69ef526ac9

View File

@ -536,7 +536,7 @@ function enroll_nodes {
-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