Browse code
Enroll Ironic nodes /w IRONIC_KEY_FILE
Do not compose a full path to the ironic ssh keyfile. Instead,
use IRONIC_KEY_FILE which will be set to the full path to the key.
This is required when IRONIC_KEY_FILE is user-specified, otherwise
we're still enrolling nodes with the default path that is only
used when generating a key.
Change-Id: Icf1ba97becc3e800caf9329a16b79cf106ac3c9a
Adam Gandelman authored on 2014/12/12 07:53:17Showing 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 |