| commit | 69ef526ac9fbb83c9b6e0cf6d5fc6e65f20fcf54 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Sat Jan 10 03:42:15 2015 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Sat Jan 10 03:42:16 2015 +0000 |
| tree | f825903fe20d6ffe1c65e035eeca897ad6563ef4 | |
| parent | 441ff07b97b4d44a25479912ff2878be3fa6e9a9 [diff] | |
| parent | d4a6e355cab59f61c269139092e261aa105f52dc [diff] |
Merge "Enroll Ironic nodes /w IRONIC_KEY_FILE"
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