Skip to content

Commit d9ce873

Browse files
committed
Address review comments
1 parent 3ec077a commit d9ce873

4 files changed

Lines changed: 6 additions & 8 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ heartbeat_timeout = 360
1414
sync_local_state_interval = 360
1515

1616
# Normally this is 100. We see eventlet threads
17-
# not making much progress, to for saftey reduce
17+
# not making much progress, so for saftey reduce
1818
# this by half, should leave work on rabbit queu
1919
workers_pool_size = 50
2020
# Normally this is 8, keep it same

etc/kayobe/environments/baremetal/kolla/config/neutron.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/config/nova/nova-compute-ironic.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[DEFAULT]
2-
# Don't limit the number of concurrent builds for the nova ironic compute
3-
# service.
2+
# Increase the number of concurrent builds for the nova ironic compute service.
3+
# This raises the default limit from 10 to 35.
44
max_concurrent_builds = 35
55
force_config_drive = True
66

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
# HAProxy tunings
55

66
{% if kolla_enable_ironic | bool and "genericswitch" in kolla_neutron_ml2_mechanism_drivers %}
7-
# NOTE: We are increasing the HAProxy timeouts to 5 minutes due to the neutron
7+
# NOTE: We are increasing the HAProxy timeouts to 5 minutes and 30 seconds due
8+
# to the neutron
89
# generic switch driver, which synchronously applies switch configuration for
910
# each ironic port during node provisioning and tear down.
1011
# The specific API calls that require this long timeout are:
@@ -14,9 +15,6 @@
1415
# - Deletion of ports.
1516
haproxy_client_timeout: 5m30
1617
haproxy_server_timeout: 5m30
17-
# If using Neutron backend TLS:
18-
neutron_tls_proxy_client_timeout: 5m30
19-
neutron_tls_proxy_server_timeout: 5m30
2018
{% endif %}
2119

2220
#############################################################################

0 commit comments

Comments
 (0)