@@ -59,7 +59,6 @@ IRONIC_HW_EPHEMERAL_DISK=${IRONIC_HW_EPHEMERAL_DISK:-0}

 IRONIC_IPMIINFO_FILE=${IRONIC_IPMIINFO_FILE:-$IRONIC_DATA_DIR/hardware_info}

 # Set up defaults for functional / integration testing

-IRONIC_NODE_UUID=${IRONIC_NODE_UUID:-`uuidgen`}

 IRONIC_SCRIPTS_DIR=${IRONIC_SCRIPTS_DIR:-$TOP_DIR/tools/ironic/scripts}

 IRONIC_TEMPLATES_DIR=${IRONIC_TEMPLATES_DIR:-$TOP_DIR/tools/ironic/templates}

 IRONIC_BAREMETAL_BASIC_OPS=$(trueorfalse False IRONIC_BAREMETAL_BASIC_OPS)

@@ -621,6 +620,7 @@ function enroll_nodes {

         # First node created will be used for testing in ironic w/o glance

         # scenario, so we need to know its UUID.

+        IRONIC_NODE_UUID=${IRONIC_NODE_UUID:-`uuidgen`}

         local standalone_node_uuid=$([ $total_nodes -eq 0 ] && echo "--uuid $IRONIC_NODE_UUID")

         local node_id=$(ironic node-create $standalone_node_uuid\