openstack/devstack
Code Issues Proposed changes

Enroll Ironic nodes /w IRONIC_KEY_FILE

Browse Source 
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
This commit is contained in:
Adam Gandelman 2014-12-11 14:53:17 -08:00
parent 3e6fe6fd47
commit d4a6e355ca
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ironic
View File

@ -536,7 +536,7 @@ function enroll_nodes {
-i ssh_address=$IRONIC_VM_SSH_ADDRESS \ -i ssh_address=$IRONIC_VM_SSH_ADDRESS \
-i ssh_port=$IRONIC_VM_SSH_PORT \ -i ssh_port=$IRONIC_VM_SSH_PORT \
-i ssh_username=$IRONIC_SSH_USERNAME \ -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 else
local ironic_node_cpu=$IRONIC_HW_NODE_CPU local ironic_node_cpu=$IRONIC_HW_NODE_CPU
local ironic_node_ram=$IRONIC_HW_NODE_RAM local ironic_node_ram=$IRONIC_HW_NODE_RAM