openstack/devstack
Code Issues Proposed changes

Move ironic ssh key creation early in preparation

Browse Source 
SSH creds should be in place before nodes are enrolled.  If not,
ironic cannot sync power state causing nova to skip nodes in
its resource tracker.

Change-Id: I6b98ae57ce33783f69e2cf9ba357807d384b3012
Closes-bug: #1398128
This commit is contained in:
Adam Gandelman 2014-12-05 16:49:12 -08:00
parent 55d8f1df95
commit 0354640587
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ironic
View File

@ -740,6 +740,9 @@ function upload_baremetal_ironic_deploy {
} }
function prepare_baremetal_basic_ops { function prepare_baremetal_basic_ops {
if ! is_ironic_hardware; then
configure_ironic_auxiliary
fi
upload_baremetal_ironic_deploy upload_baremetal_ironic_deploy
if ! is_ironic_hardware; then if ! is_ironic_hardware; then
create_bridge_and_vms create_bridge_and_vms
@ -747,9 +750,6 @@ function prepare_baremetal_basic_ops {
enroll_nodes enroll_nodes
configure_tftpd configure_tftpd
configure_iptables configure_iptables
if ! is_ironic_hardware; then
configure_ironic_auxiliary
fi
} }
function cleanup_baremetal_basic_ops { function cleanup_baremetal_basic_ops {