From 6a2bd8e38717b8f422f10719fd1e85519ca51013 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Wed, 23 Sep 2015 18:28:24 +0200 Subject: [PATCH] devstack: allow nodes to be already MANAGEABLE in exercise Previously exercise.sh would fail in this case. It does not matter for the gate, but simplifies testing locally. Change-Id: Ibfa519ae15b17d6c8ed915a01e9b56296bab1bab --- devstack/exercise.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/devstack/exercise.sh b/devstack/exercise.sh index 6606b6c50..4cde85d0a 100755 --- a/devstack/exercise.sh +++ b/devstack/exercise.sh @@ -76,7 +76,9 @@ for uuid in $nodes; do for p in cpus cpu_arch memory_mb local_gb; do ironic node-update $uuid remove properties/$p > /dev/null || true done - ironic node-set-provision-state $uuid manage + if ! ironic node-show $uuid | grep provision_state | grep -iq manageable; then + ironic node-set-provision-state $uuid manage + fi done openstack baremetal introspection rule purge