Skip to content

Commit feb0c92

Browse files
committed
Set HAProxy timeout to 60 seconds for storage
This patch sets the HAProxy timeout to 60 seconds for storage services (Cinder, Glance, and Manila). This way it's in sync with the Apache default timeouts and matches what we have in OSP17. This will be fixed in the operators themselves to have these same defaults, and this patch is compatible with that change. When the operators code is merged and is run by the CI jobs the defaults in the operators will be ignored in favor of the defaults defined in this patch, so we'll want to revert this patch then. Jira: https://issues.redhat.com/browse/OSPRH-7393 Jira: https://issues.redhat.com/browse/OSPRH-7415
1 parent 27ee3f7 commit feb0c92

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

lib/control-plane/openstackcontrolplane.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
serviceUser: ceilometer
2525
cinder:
2626
apiOverride:
27-
route: {}
27+
route: {"haproxy.router.openshift.io/timeout": "60s"}
2828
template:
2929
customServiceConfig: |
3030
# Debug logs by default, jobs can override as needed.
@@ -63,7 +63,7 @@ spec:
6363
glance:
6464
apiOverrides:
6565
default:
66-
route: {}
66+
route: {"haproxy.router.openshift.io/timeout": "60s"}
6767
template:
6868
databaseInstance: openstack
6969
glanceAPIs:
@@ -115,7 +115,7 @@ spec:
115115
secret: osp-secret
116116
manila:
117117
apiOverride:
118-
route: {}
118+
route: {"haproxy.router.openshift.io/timeout": "60s"}
119119
enabled: false
120120
template:
121121
manilaAPI:

0 commit comments

Comments
 (0)