diff options
| author | Julia Kreger <juliaashleykreger@gmail.com> | 2018-01-24 12:43:12 -0800 |
|---|---|---|
| committer | Ruby Loo <ruby.loo@intel.com> | 2018-01-31 14:20:22 +0000 |
| commit | 4d55777da687d25660bf8acc7054ebec424f7204 (patch) | |
| tree | b79a058e3d2b6cf1d407d057d6fcd104c3a2e10d | |
| parent | a26082ac195cb3d4a9f5f6f7638d1357c58d3e03 (diff) | |
| download | ironic-4d55777da687d25660bf8acc7054ebec424f7204.tar.gz | |
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
(cherry picked from commit 904f44522b665da52ec44133fbb8fc46c00d0105)
3 files changed, 3 insertions, 1 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index be4b80381..486f543af 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -462,7 +462,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 abdee8c94..ae4d3006f 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 2aaaf30e3..602391dc0 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' |