From 48fd602f2328deffef1ec97bfb1dc2af79521f10 Mon Sep 17 00:00:00 2001 From: James Slagle <jslagle@redhat.com> Date: Thu, 31 Jul 2014 09:23:39 -0400 Subject: [PATCH] Delete ironic nodes on cleanup --- scripts/instack-delete-overcloud | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/instack-delete-overcloud b/scripts/instack-delete-overcloud index 2ee0660f4..5b913a84a 100755 --- a/scripts/instack-delete-overcloud +++ b/scripts/instack-delete-overcloud @@ -8,10 +8,10 @@ heat stack-delete overcloud || true SUCCESSFUL_MATCH_OUTPUT="Stack not found: overcloud" tripleo wait_for 6 10 heat stack-show overcloud # cleanup the baremetal-nodes -node_ids=$(nova baremetal-node-list | grep undercloud | awk -F "| " '{ print $2; }') +node_ids=$(ironic node-list | tail -n +4 | head -n -1 | awk -F "| " '{print $2}') for id in $node_ids; do - nova baremetal-node-delete $id + ironic node-delete $id done nova flavor-delete baremetal || true