From 904f44522b665da52ec44133fbb8fc46c00d0105 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Wed, 24 Jan 2018 12:43:12 -0800 Subject: [PATCH] Be more sane about cleaning Seems that by default we now run cleaning on all jobs. However, this is extremely wasteful and time consuming. Also, if a cloud is IO resource constrained, it can result in jobs failing erroneously due to unpredictable IO performance, particularly with the multinode jobs. As such, slightly extend the wait timeout before we fail for nodes not being ready, and flag multinode jobs not to run cleaning. Change-Id: I12011743fa197caef08a3d6d1297d662dfa7640a --- devstack/lib/ironic | 2 +- .../legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml | 1 + .../run.yaml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/devstack/lib/ironic b/devstack/lib/ironic index ebf6c6fa4b..229796a32a 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -483,7 +483,7 @@ fi IRONIC_MANAGE_TIMEOUT=${IRONIC_MANAGE_TIMEOUT:-120} # Timeout for "provide" action. This involves cleaning. Generally, 15 minutes # should be enough, but real hardware may need more. -IRONIC_CLEANING_TIMEOUT=${IRONIC_CLEANING_TIMEOUT:-900} +IRONIC_CLEANING_TIMEOUT=${IRONIC_CLEANING_TIMEOUT:-1200} IRONIC_CLEANING_DELAY=10 IRONIC_CLEANING_ATTEMPTS=$(( $IRONIC_CLEANING_TIMEOUT / $IRONIC_CLEANING_DELAY )) diff --git a/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml b/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml index 775f684ba4..bbe90d98cb 100644 --- a/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml +++ b/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml @@ -88,6 +88,7 @@ export DEVSTACK_LOCAL_CONFIG+=$'\n'"TENANT_VLAN_RANGE=100:150" export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_ENABLED_NETWORK_INTERFACES=flat,neutron" export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_NETWORK_INTERFACE=neutron" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_AUTOMATED_CLEAN_ENABLED=False" EOF chdir: '{{ ansible_user_dir }}/workspace' diff --git a/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode/run.yaml index 875763f587..6261968496 100644 --- a/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode/run.yaml +++ b/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode/run.yaml @@ -80,6 +80,7 @@ export DEVSTACK_LOCAL_CONFIG+=$'\n'"TENANT_VLAN_RANGE=100:150" export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_ENABLED_NETWORK_INTERFACES=flat,neutron" export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_NETWORK_INTERFACE=neutron" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_AUTOMATED_CLEAN_ENABLED=False" EOF chdir: '{{ ansible_user_dir }}/workspace'