Skip to content

Commit 8694a5c

Browse files
committed
Address review comments #2
1 parent d9ce873 commit 8694a5c

4 files changed

Lines changed: 5 additions & 8 deletions

File tree

etc/kayobe/environments/baremetal/kolla/config/ironic-inspector.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[DEFAULT]
22
timeout = 0
33
{% if "genericswitch" in kolla_neutron_ml2_mechanism_drivers %}
4-
# We are increasing the RPC response timeouts to 5 minutes due to the neutron
4+
# We are increasing the RPC response timeouts to 6 minutes due to the neutron
55
# generic switch driver, which synchronously applies switch configuration for
66
# each ironic port during node provisioning and tear down.
77
# The specific API calls that require this long timeout are:

etc/kayobe/environments/baremetal/kolla/config/nova.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[DEFAULT]
22
{% if kolla_enable_ironic | bool and "genericswitch" in kolla_neutron_ml2_mechanism_drivers %}
3-
# We are increasing the RPC response timeouts to 5 minutes due to the neutron
3+
# We are increasing the RPC response timeouts to 6 minutes due to the neutron
44
# generic switch driver, which synchronously applies switch configuration for
55
# each ironic port during node provisioning and tear down.
66
# The specific API calls that require this long timeout are:

etc/kayobe/environments/baremetal/kolla/globals.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@
1515
# - Deletion of ports.
1616
haproxy_client_timeout: 5m30
1717
haproxy_server_timeout: 5m30
18+
neutron_tls_proxy_client_timeout: 5m30
19+
neutron_tls_proxy_server_timeout: 5m30
1820
{% endif %}
1921

2022
#############################################################################
2123
# Neutron tunings
2224

23-
{% if kolla_enable_ironic | bool and "genericswitch" in kolla_neutron_ml2_mechanism_drivers %}
24-
neutron_tls_proxy_client_timeout: 5m30
25-
neutron_tls_proxy_server_timeout: 5m30
26-
{% endif %}
27-
2825
#############################################################################

releasenotes/notes/add-baremetal-mixin-0475561bc5545d50.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ features:
33
- |
44
Added the ``baremetal`` mixin environment. This is an opt-in feature.
55
Please see the `docs
6-
<https://stackhpc-kayobe-config.readthedocs.io/en/stackhpc-2025.1/configuration/stackhpc-mixin-environments.html>`__
6+
<https://stackhpc-kayobe-config.readthedocs.io/en/latest/configuration/stackhpc-mixin-environments.html>`__
77
for more details.

0 commit comments

Comments
 (0)