fix(openstack): add oslo middleware healthcheck probes

yaguangtang · yaguangtang · commit 80a0b29d93c3 · 2026-06-05T23:44:21.000+08:00
Signed-off-by: Yaguang Tang &lt;yaguang.tang@vexxhost.com&gt;
diff --git a/charts/barbican/templates/deployment-api.yaml b/charts/barbican/templates/deployment-api.yaml
@@ -84,7 +84,7 @@ spec:
           readinessProbe:
             httpGet:
               scheme: HTTP
-              path: /
+              path: /healthcheck
               port: {{ tuple "key_manager" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           volumeMounts:
             - name: pod-tmp
diff --git a/charts/barbican/values.yaml b/charts/barbican/values.yaml
@@ -295,6 +295,7 @@ conf:
       use: egg:Paste#urlmap
       /: barbican_version
       /v1: barbican-api-keystone
+      /healthcheck: healthcheck
     pipeline:barbican_version:
       pipeline: cors http_proxy_to_wsgi versionapp
     pipeline:barbican_api:
@@ -309,6 +310,10 @@ conf:
       paste.app_factory: barbican.api.app:create_main_app
     app:versionapp:
       paste.app_factory: barbican.api.app:create_version_app
+    app:healthcheck:
+      paste.app_factory: oslo_middleware:Healthcheck.app_factory
+      backends: disable_by_file
+      disable_by_file_path: /var/run/barbican/healthcheck_disable
     filter:simple:
       paste.filter_factory: barbican.api.middleware.simple:SimpleFilter.factory
     filter:unauthenticated-context:
diff --git a/charts/cinder/templates/deployment-api.yaml b/charts/cinder/templates/deployment-api.yaml
@@ -100,13 +100,13 @@ spec:
           readinessProbe:
             httpGet:
               scheme: {{ tuple "volume" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
-              path: /
+              path: /healthcheck
               port: {{ tuple "volume" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
             initialDelaySeconds: 30
           livenessProbe:
             httpGet:
               scheme: {{ tuple "volume" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
-              path: /
+              path: /healthcheck
               port: {{ tuple "volume" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
             initialDelaySeconds: 5
             failureThreshold: 3
diff --git a/charts/cinder/values.yaml b/charts/cinder/values.yaml
@@ -440,6 +440,7 @@ conf:
       /v1: openstack_volume_api_v1
       /v2: openstack_volume_api_v2
       /v3: openstack_volume_api_v3
+      /healthcheck: healthcheck
     composite:openstack_volume_api_v1:
       use: call:cinder.api.middleware.auth:pipeline_factory
       noauth: cors http_proxy_to_wsgi request_id faultwrap sizelimit osprofiler noauth apiv1
@@ -480,6 +481,10 @@ conf:
       pipeline: cors http_proxy_to_wsgi faultwrap osvolumeversionapp
     app:osvolumeversionapp:
       paste.app_factory: cinder.api.versions:Versions.factory
+    app:healthcheck:
+      paste.app_factory: oslo_middleware:Healthcheck.app_factory
+      backends: disable_by_file
+      disable_by_file_path: /var/run/cinder/healthcheck_disable
     filter:keystonecontext:
       paste.filter_factory: cinder.api.middleware.auth:CinderKeystoneContext.factory
     filter:authtoken:
diff --git a/charts/designate/templates/deployment-api.yaml b/charts/designate/templates/deployment-api.yaml
@@ -71,7 +71,7 @@ spec:
           readinessProbe:
             httpGet:
               scheme: {{ tuple "dns" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
-              path: /
+              path: /healthcheck
               port: {{ tuple "dns" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           volumeMounts:
             - name: designate-bin
diff --git a/charts/designate/values.yaml b/charts/designate/values.yaml
@@ -402,6 +402,7 @@ conf:
       /: osapi_dns_versions
       /v2: osapi_dns_v2
       /admin: osapi_dns_admin
+      /healthcheck: healthcheck
     composite:osapi_dns_versions:
       use: call:designate.api.middleware:auth_pipeline_factory
       noauth: http_proxy_to_wsgi cors maintenance faultwrapper osapi_dns_app_versions
@@ -420,6 +421,10 @@ conf:
       keystone: http_proxy_to_wsgi cors request_id faultwrapper authtoken keystonecontext maintenance normalizeuri osapi_dns_app_admin
     app:osapi_dns_app_admin:
       paste.app_factory: designate.api.admin:factory
+    app:healthcheck:
+      paste.app_factory: oslo_middleware:Healthcheck.app_factory
+      backends: disable_by_file
+      disable_by_file_path: /var/run/designate/healthcheck_disable
     filter:cors:
       paste.filter_factory: oslo_middleware.cors:filter_factory
       oslo_config_project: designate
diff --git a/charts/glance/templates/deployment-api.yaml b/charts/glance/templates/deployment-api.yaml
@@ -18,11 +18,11 @@ exec:
   command:
     - python
     - -c
-    - "import requests; requests.get('http://127.0.0.1:{{ tuple "image" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}')"
+    - "import requests; requests.get('http://127.0.0.1:{{ tuple "image" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}/healthcheck')"
 {{- else }}
 httpGet:
   scheme: {{ tuple "image" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
-  path: /
+  path: /healthcheck
   port: {{ tuple "image" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
 {{- end }}
 {{- end }}
@@ -33,11 +33,11 @@ exec:
   command:
     - python
     - -c
-    - "import requests; requests.get('http://127.0.0.1:{{ tuple "image" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}')"
+    - "import requests; requests.get('http://127.0.0.1:{{ tuple "image" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}/healthcheck')"
 {{- else }}
 httpGet:
   scheme: {{ tuple "image" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
-  path: /
+  path: /healthcheck
   port: {{ tuple "image" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
 {{- end }}
 {{- end }}
diff --git a/charts/glance/values.yaml b/charts/glance/values.yaml
@@ -171,7 +171,7 @@ conf:
     app:healthcheck:
       paste.app_factory: oslo_middleware:Healthcheck.app_factory
       backends: disable_by_file
-      disable_by_file_path: /etc/glance/healthcheck_disable
+      disable_by_file_path: /var/run/glance/healthcheck_disable
     filter:versionnegotiation:
       paste.filter_factory: glance.api.middleware.version_negotiation:VersionNegotiationFilter.factory
     filter:cache:
diff --git a/charts/heat/templates/deployment-api.yaml b/charts/heat/templates/deployment-api.yaml
@@ -84,12 +84,12 @@ spec:
           readinessProbe:
             httpGet:
               scheme: {{ tuple "orchestration" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
-              path: /
+              path: /healthcheck
               port: {{ tuple "orchestration" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           livenessProbe:
             httpGet:
               scheme: {{ tuple "orchestration" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
-              path: /
+              path: /healthcheck
               port: {{ tuple "orchestration" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
             initialDelaySeconds: 10
           volumeMounts:
diff --git a/charts/heat/templates/deployment-cfn.yaml b/charts/heat/templates/deployment-cfn.yaml
@@ -84,12 +84,12 @@ spec:
           readinessProbe:
             httpGet:
               scheme: {{ tuple "cloudformation" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
-              path: /
+              path: /healthcheck
               port: {{ tuple "cloudformation" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           livenessProbe:
             httpGet:
               scheme: {{ tuple "cloudformation" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
-              path: /
+              path: /healthcheck
               port: {{ tuple "cloudformation" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
             initialDelaySeconds: 10
           volumeMounts:
diff --git a/charts/heat/templates/deployment-cloudwatch.yaml b/charts/heat/templates/deployment-cloudwatch.yaml
@@ -78,7 +78,7 @@ spec:
           readinessProbe:
             httpGet:
               scheme: {{ tuple "cloudwatch" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
-              path: /
+              path: /healthcheck
               port: {{ tuple "cloudwatch" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           volumeMounts:
             - name: pod-tmp
diff --git a/charts/heat/values.yaml b/charts/heat/values.yaml
@@ -281,19 +281,47 @@ conf:
               properties:
                 length: 40
   paste:
-    pipeline:heat-api:
+    composite:heat-api:
+      use: egg:Paste#urlmap
+      /: heat-api-pipeline
+      /healthcheck: healthcheck
+    composite:heat-api-standalone:
+      use: egg:Paste#urlmap
+      /: heat-api-standalone-pipeline
+      /healthcheck: healthcheck
+    composite:heat-api-custombackend:
+      use: egg:Paste#urlmap
+      /: heat-api-custombackend-pipeline
+      /healthcheck: healthcheck
+    composite:heat-api-cfn:
+      use: egg:Paste#urlmap
+      /: heat-api-cfn-pipeline
+      /healthcheck: healthcheck
+    composite:heat-api-cfn-standalone:
+      use: egg:Paste#urlmap
+      /: heat-api-cfn-standalone-pipeline
+      /healthcheck: healthcheck
+    composite:heat-api-cloudwatch:
+      use: egg:Paste#urlmap
+      /: heat-api-cloudwatch-pipeline
+      /healthcheck: healthcheck
+    composite:heat-api-cloudwatch-standalone:
+      use: egg:Paste#urlmap
+      /: heat-api-cloudwatch-standalone-pipeline
+      /healthcheck: healthcheck
+    pipeline:heat-api-pipeline:
       pipeline: cors request_id faultwrap http_proxy_to_wsgi versionnegotiation osprofiler authurl authtoken audit context apiv1app
-    pipeline:heat-api-standalone:
+    pipeline:heat-api-standalone-pipeline:
       pipeline: cors request_id faultwrap http_proxy_to_wsgi versionnegotiation authurl authpassword context apiv1app
-    pipeline:heat-api-custombackend:
+    pipeline:heat-api-custombackend-pipeline:
       pipeline: cors request_id faultwrap versionnegotiation context custombackendauth apiv1app
-    pipeline:heat-api-cfn:
+    pipeline:heat-api-cfn-pipeline:
       pipeline: cors http_proxy_to_wsgi cfnversionnegotiation osprofiler ec2authtoken authtoken audit context apicfnv1app
-    pipeline:heat-api-cfn-standalone:
+    pipeline:heat-api-cfn-standalone-pipeline:
       pipeline: cors http_proxy_to_wsgi cfnversionnegotiation ec2authtoken context apicfnv1app
-    pipeline:heat-api-cloudwatch:
+    pipeline:heat-api-cloudwatch-pipeline:
       pipeline: cors versionnegotiation osprofiler ec2authtoken authtoken audit context apicwapp
-    pipeline:heat-api-cloudwatch-standalone:
+    pipeline:heat-api-cloudwatch-standalone-pipeline:
       pipeline: cors versionnegotiation ec2authtoken context apicwapp
     app:apiv1app:
       paste.app_factory: heat.common.wsgi:app_factory
@@ -304,6 +332,10 @@ conf:
     app:apicwapp:
       paste.app_factory: heat.common.wsgi:app_factory
       heat.app_factory: heat.api.cloudwatch:API
+    app:healthcheck:
+      paste.app_factory: oslo_middleware:Healthcheck.app_factory
+      backends: disable_by_file
+      disable_by_file_path: /var/run/heat/healthcheck_disable
     filter:versionnegotiation:
       paste.filter_factory: heat.common.wsgi:filter_factory
       heat.filter_factory: heat.api.openstack:version_negotiation_filter
diff --git a/charts/magnum/templates/deployment-api.yaml b/charts/magnum/templates/deployment-api.yaml
@@ -75,7 +75,7 @@ spec:
           readinessProbe:
             httpGet:
               scheme: HTTP
-              path: /
+              path: /healthcheck
               port: {{ tuple "container-infra" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
             initialDelaySeconds: 5
             periodSeconds: 10
diff --git a/charts/magnum/values.yaml b/charts/magnum/values.yaml
@@ -71,7 +71,7 @@ conf:
     app:healthcheck:
       paste.app_factory: oslo_middleware:Healthcheck.app_factory
       backends: disable_by_file
-      disable_by_file_path: /etc/magnum/healthcheck_disable
+      disable_by_file_path: /var/run/magnum/healthcheck_disable
   policy: {}
   magnum:
     DEFAULT:
diff --git a/charts/neutron/templates/deployment-server.yaml b/charts/neutron/templates/deployment-server.yaml
@@ -18,12 +18,12 @@ exec:
   command:
     - python
     - -c
-    - "import requests; requests.get('http://127.0.0.1:{{ tuple "network" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}')"
+    - "import requests; requests.get('http://127.0.0.1:{{ tuple "network" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}/healthcheck')"
 initialDelaySeconds: 30
 {{- else }}
 httpGet:
   scheme: {{ tuple "network" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
-  path: /
+  path: /healthcheck
   port: {{ tuple "network" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
 {{- end }}
 {{- end }}
@@ -33,12 +33,12 @@ exec:
   command:
     - python
     - -c
-    - "import requests; requests.get('http://127.0.0.1:{{ tuple "network" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}')"
+    - "import requests; requests.get('http://127.0.0.1:{{ tuple "network" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}/healthcheck')"
 initialDelaySeconds: 30
 {{- else }}
 httpGet:
   scheme: {{ tuple "network" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
-  path: /
+  path: /healthcheck
   port: {{ tuple "network" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
 {{- end }}
 {{- end }}
@@ -142,7 +142,7 @@ spec:
           readinessProbe:
             httpGet:
               scheme: HTTPS
-              path: /
+              path: /healthcheck
               port: {{ tuple "network" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           command:
             - /tmp/nginx.sh
diff --git a/charts/neutron/values.yaml b/charts/neutron/values.yaml
@@ -1339,6 +1339,7 @@ conf:
       use: egg:Paste#urlmap
       /: neutronversions_composite
       /v2.0: neutronapi_v2_0
+      /healthcheck: healthcheck
     composite:neutronapi_v2_0:
       use: call:neutron.auth:pipeline_factory
       noauth: cors http_proxy_to_wsgi request_id catch_errors extensions neutronapiapp_v2_0
@@ -1369,6 +1370,10 @@ conf:
       paste.app_factory: neutron.pecan_wsgi.app:versions_factory
     app:neutronapiapp_v2_0:
       paste.app_factory: neutron.api.v2.router:APIRouter.factory
+    app:healthcheck:
+      paste.app_factory: oslo_middleware:Healthcheck.app_factory
+      backends: disable_by_file
+      disable_by_file_path: /var/run/neutron/healthcheck_disable
     filter:osprofiler:
       paste.filter_factory: osprofiler.web:WsgiMiddleware.factory
   neutron_api_uwsgi:
diff --git a/charts/nova/templates/deployment-api-metadata.yaml b/charts/nova/templates/deployment-api-metadata.yaml
@@ -15,14 +15,14 @@ limitations under the License.
 {{- define "novaApiMetadataLivenessProbeTemplate" }}
 httpGet:
   scheme: {{ tuple "compute_metadata" "service" "metadata" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
-  path: /
+  path: /healthcheck
   port: {{ .Values.network.metadata.port }}
 {{- end }}
 
 {{- define "novaApiMetadataReadinessProbeTemplate" }}
 httpGet:
   scheme: {{ tuple "compute_metadata" "service" "metadata" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
-  path: /
+  path: /healthcheck
   port: {{ .Values.network.metadata.port }}
 {{- end }}
 
diff --git a/charts/nova/templates/deployment-api-osapi.yaml b/charts/nova/templates/deployment-api-osapi.yaml
@@ -15,14 +15,14 @@ limitations under the License.
 {{- define "novaApiOsapiLivenessProbeTemplate" }}
 httpGet:
   scheme: {{ tuple "compute" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
-  path: /
+  path: /healthcheck
   port: {{ tuple "compute" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
 {{- end }}
 
 {{- define "novaApiOsapiReadinessProbeTemplate" }}
 httpGet:
   scheme: {{ tuple "compute" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
-  path: /
+  path: /healthcheck
   port: {{ tuple "compute" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
 {{- end }}
 
diff --git a/charts/nova/values.yaml b/charts/nova/values.yaml
@@ -832,6 +832,7 @@ conf:
     composite:metadata:
       use: egg:Paste#urlmap
       /: meta
+      /healthcheck: healthcheck
     pipeline:meta:
       pipeline: cors metaapp
     app:metaapp:
@@ -841,6 +842,7 @@ conf:
       /: oscomputeversions
       /v2: openstack_compute_api_v21_legacy_v2_compatible
       /v2.1: openstack_compute_api_v21
+      /healthcheck: healthcheck
     composite:openstack_compute_api_v21:
       use: call:nova.api.auth:pipeline_factory_v21
       noauth2: cors http_proxy_to_wsgi compute_req_id faultwrap sizelimit noauth2 osapi_compute_app_v21
@@ -869,6 +871,10 @@ conf:
       pipeline: faultwrap http_proxy_to_wsgi oscomputeversionapp
     app:oscomputeversionapp:
       paste.app_factory: nova.api.openstack.compute.versions:Versions.factory
+    app:healthcheck:
+      paste.app_factory: oslo_middleware:Healthcheck.app_factory
+      backends: disable_by_file
+      disable_by_file_path: /var/run/nova/healthcheck_disable
     filter:cors:
       paste.filter_factory: oslo_middleware.cors:filter_factory
       oslo_config_project: nova
diff --git a/charts/patches/barbican/0004-add-oslo-middleware-healthcheck.patch b/charts/patches/barbican/0004-add-oslo-middleware-healthcheck.patch
diff --git a/charts/patches/cinder/0006-add-oslo-middleware-healthcheck.patch b/charts/patches/cinder/0006-add-oslo-middleware-healthcheck.patch
diff --git a/charts/patches/designate/0003-add-oslo-middleware-healthcheck.patch b/charts/patches/designate/0003-add-oslo-middleware-healthcheck.patch
diff --git a/charts/patches/glance/0004-use-healthcheck-endpoint-for-kubelet.patch b/charts/patches/glance/0004-use-healthcheck-endpoint-for-kubelet.patch
diff --git a/charts/patches/heat/0004-add-oslo-middleware-healthcheck.patch b/charts/patches/heat/0004-add-oslo-middleware-healthcheck.patch
diff --git a/charts/patches/magnum/0004-use-healthcheck-endpoint-for-kubelet.patch b/charts/patches/magnum/0004-use-healthcheck-endpoint-for-kubelet.patch
diff --git a/charts/patches/neutron/0009-add-oslo-middleware-healthcheck.patch b/charts/patches/neutron/0009-add-oslo-middleware-healthcheck.patch
diff --git a/charts/patches/nova/0005-add-oslo-middleware-healthcheck.patch b/charts/patches/nova/0005-add-oslo-middleware-healthcheck.patch
diff --git a/releasenotes/notes/openstack-healthcheck-probes-e162a50c275eb194.yaml b/releasenotes/notes/openstack-healthcheck-probes-e162a50c275eb194.yaml
