From e273c0433f40ba581703dae4378a74af40410c9f Mon Sep 17 00:00:00 2001 From: Eric Fried Date: Tue, 13 Aug 2019 14:28:24 -0500 Subject: [PATCH] Set ksa retry conf options for n-cpu [ironic] We're trying to get nova to talk to ironic through openstacksdk and need to be able to specify retry limits/intervals there. We could reuse the existing conf options, but better to support the standard ones exposed from keystoneauth1 via [1] and [2]. Note that these will be ignored unless you have keystoneauth1 3.15.0 (for [1]) or 3.16.0 ([1] and [2]) and are building your adapter using ksa-derived conf options (see the Needed-By). Needed-By: https://review.opendev.org/642899 [1] https://review.opendev.org/#/c/666287/ [2] https://review.opendev.org/#/c/672930/ Change-Id: I79c416e25d635b0ffa419640b4bd91e36f78b1ab --- lib/nova_plugins/hypervisor-ironic | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/nova_plugins/hypervisor-ironic b/lib/nova_plugins/hypervisor-ironic index 9bc04e2122..adcc278812 100644 --- a/lib/nova_plugins/hypervisor-ironic +++ b/lib/nova_plugins/hypervisor-ironic @@ -54,8 +54,14 @@ function configure_nova_hypervisor { iniset $NOVA_CONF ironic project_name demo iniset $NOVA_CONF ironic region_name $REGION_NAME + # These are used with crufty legacy ironicclient iniset $NOVA_CONF ironic api_max_retries 300 iniset $NOVA_CONF ironic api_retry_interval 5 + # These are used with shiny new openstacksdk + iniset $NOVA_CONF ironic connect_retries 300 + iniset $NOVA_CONF ironic connect_retry_delay 5 + iniset $NOVA_CONF ironic status_code_retries 300 + iniset $NOVA_CONF ironic status_code_retry_delay 5 } # install_nova_hypervisor() - Install external components