Merge "Allow to customise hardware inspection timeouts"
This commit is contained in:
commit
fed87a1e9d
@ -29,7 +29,7 @@
|
|||||||
baremetal_compute_wait: True
|
baremetal_compute_wait: True
|
||||||
# Time to wait for state transition to complete, if baremetal_compute_wait
|
# Time to wait for state transition to complete, if baremetal_compute_wait
|
||||||
# is True.
|
# is True.
|
||||||
baremetal_compute_timeout: 1200
|
baremetal_compute_timeout: "{{ inspector_inspection_timeout }}"
|
||||||
tasks:
|
tasks:
|
||||||
- name: Ensure baremetal compute nodes are inspected in ironic
|
- name: Ensure baremetal compute nodes are inspected in ironic
|
||||||
os_ironic_inspect:
|
os_ironic_inspect:
|
||||||
|
@ -87,6 +87,10 @@ kolla_bifrost_inspector_deploy_kernel: "http://{{ provision_oc_net_name | net_ip
|
|||||||
# Ironic inspector deployment ramdisk location.
|
# Ironic inspector deployment ramdisk location.
|
||||||
kolla_bifrost_inspector_deploy_ramdisk: "http://{{ provision_oc_net_name | net_ip }}:8080/ipa.initramfs"
|
kolla_bifrost_inspector_deploy_ramdisk: "http://{{ provision_oc_net_name | net_ip }}:8080/ipa.initramfs"
|
||||||
|
|
||||||
|
# Timeout of hardware inspection on overcloud nodes, in seconds. Default is
|
||||||
|
# {{ inspector_inspection_timeout }}.
|
||||||
|
kolla_bifrost_inspection_timeout: "{{ inspector_inspection_timeout }}"
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# Ironic Python Agent (IPA) configuration.
|
# Ironic Python Agent (IPA) configuration.
|
||||||
|
|
||||||
|
@ -1,4 +1,11 @@
|
|||||||
---
|
---
|
||||||
|
###############################################################################
|
||||||
|
# General configuration of inspection.
|
||||||
|
|
||||||
|
# Timeout of hardware inspection on baremetal compute nodes, in seconds.
|
||||||
|
# Default is 1200.
|
||||||
|
inspector_inspection_timeout: 1200
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# Ironic inspector PXE configuration.
|
# Ironic inspector PXE configuration.
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
vars:
|
vars:
|
||||||
# Set to False to avoid waiting for the nodes to become active.
|
# Set to False to avoid waiting for the nodes to become active.
|
||||||
wait_inspected: True
|
wait_inspected: True
|
||||||
wait_inspected_timeout: 600
|
wait_inspected_timeout: "{{ kolla_bifrost_inspection_timeout }}"
|
||||||
wait_inspected_interval: 10
|
wait_inspected_interval: 10
|
||||||
# List of states from which we can get to inspecting.
|
# List of states from which we can get to inspecting.
|
||||||
inspectable_states:
|
inspectable_states:
|
||||||
|
@ -227,6 +227,10 @@ The following options configure the Ironic Inspector service in the
|
|||||||
``kolla_bifrost_inspector_deploy_ramdisk``
|
``kolla_bifrost_inspector_deploy_ramdisk``
|
||||||
Ironic inspector deployment ramdisk location. Default is ``http://{{
|
Ironic inspector deployment ramdisk location. Default is ``http://{{
|
||||||
provision_oc_net_name | net_ip }}:8080/ipa.initramfs``.
|
provision_oc_net_name | net_ip }}:8080/ipa.initramfs``.
|
||||||
|
``kolla_bifrost_inspection_timeout``
|
||||||
|
Timeout of hardware inspection on overcloud nodes, in seconds. Default is
|
||||||
|
``{{ inspector_inspection_timeout }}``, defined in
|
||||||
|
``${KAYOBE_CONFIG_PATH}/inspector.yml``.
|
||||||
|
|
||||||
Ironic Python Agent (IPA) configuration
|
Ironic Python Agent (IPA) configuration
|
||||||
=======================================
|
=======================================
|
||||||
|
@ -86,6 +86,10 @@
|
|||||||
# Ironic inspector deployment ramdisk location.
|
# Ironic inspector deployment ramdisk location.
|
||||||
#kolla_bifrost_inspector_deploy_ramdisk:
|
#kolla_bifrost_inspector_deploy_ramdisk:
|
||||||
|
|
||||||
|
# Timeout of hardware inspection on overcloud nodes, in seconds. Default is
|
||||||
|
# {{ inspector_inspection_timeout }}.
|
||||||
|
#kolla_bifrost_inspection_timeout:
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# Ironic Python Agent (IPA) configuration.
|
# Ironic Python Agent (IPA) configuration.
|
||||||
|
|
||||||
|
@ -1,4 +1,11 @@
|
|||||||
---
|
---
|
||||||
|
###############################################################################
|
||||||
|
# General configuration of inspection.
|
||||||
|
|
||||||
|
# Timeout of hardware inspection on baremetal compute nodes, in seconds.
|
||||||
|
# Default is 1200.
|
||||||
|
#inspector_inspection_timeout:
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# Ironic inspector PXE configuration.
|
# Ironic inspector PXE configuration.
|
||||||
|
|
||||||
|
@ -0,0 +1,15 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
Adds two new configuration variables, ``kolla_bifrost_inspection_timeout``
|
||||||
|
and ``inspector_inspection_timeout``, which allow to customise timeouts of
|
||||||
|
hardware inspection (in seconds) respectively for overcloud nodes and
|
||||||
|
baremetal compute nodes. ``inspector_inspection_timeout`` defaults to
|
||||||
|
``1200`` and ``kolla_bifrost_inspection_timeout`` defaults to the value of
|
||||||
|
``inspector_inspection_timeout``. See `story 2007844
|
||||||
|
<https://storyboard.openstack.org/#!/story/2007844>`__ for details.
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The default timeout for the overcloud hardware inspection operation is
|
||||||
|
increased from 10 minutes to 20 minutes, to avoid issues when using the
|
||||||
|
``extra-hardware`` collector on hardware booting slowly.
|
Loading…
Reference in New Issue
Block a user