Skip to content

Commit 7411bf2

Browse files
Jenkinsopenstack-gerrit
authored andcommitted
Merge "Move ironic ssh key creation early in preparation"
2 parents c9ccaaa + 0354640 commit 7411bf2

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

lib/ironic

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -741,16 +741,16 @@ function upload_baremetal_ironic_deploy {
741741
}
742742

743743
function prepare_baremetal_basic_ops {
744+
if ! is_ironic_hardware; then
745+
configure_ironic_auxiliary
746+
fi
744747
upload_baremetal_ironic_deploy
745748
if ! is_ironic_hardware; then
746749
create_bridge_and_vms
747750
fi
748751
enroll_nodes
749752
configure_tftpd
750753
configure_iptables
751-
if ! is_ironic_hardware; then
752-
configure_ironic_auxiliary
753-
fi
754754
}
755755

756756
function cleanup_baremetal_basic_ops {

0 commit comments

Comments
 (0)