openstack/devstack
Code Issues Proposed changes

Merge "Move ironic ssh key creation early in preparation"

Browse Source
This commit is contained in:
Jenkins 2014-12-09 17:21:41 +00:00 committed by Gerrit Code Review
commit 7411bf2574
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

@ -741,6 +741,9 @@ function upload_baremetal_ironic_deploy {
}
function prepare_baremetal_basic_ops {
if ! is_ironic_hardware; then
configure_ironic_auxiliary
fi
upload_baremetal_ironic_deploy
if ! is_ironic_hardware; then
create_bridge_and_vms
@ -748,9 +751,6 @@ function prepare_baremetal_basic_ops {
enroll_nodes
configure_tftpd
configure_iptables
if ! is_ironic_hardware; then
configure_ironic_auxiliary
fi
}
function cleanup_baremetal_basic_ops {