From 0354640587cde740aa0299c722f019ae1c01e05d Mon Sep 17 00:00:00 2001
From: Adam Gandelman <adamg@ubuntu.com>
Date: Fri, 5 Dec 2014 16:49:12 -0800
Subject: [PATCH] Move ironic ssh key creation early in preparation

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
---
 lib/ironic | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ironic b/lib/ironic
index 28f8fe87e5..058ee31195 100644
--- a/lib/ironic
+++ b/lib/ironic
@@ -740,6 +740,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
@@ -747,9 +750,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 {