Merge "uwsgi: use uWSGI stats for liveness probes in deployments"

barbican/values.yaml

@@ -392,6 +392,8 @@ conf:
       worker-reload-mercy: 80
       wsgi-file: /var/lib/openstack/bin/barbican-wsgi-api
       processes: 1
+      stats: 0.0.0.0:1717
+      stats-http: true
   barbican:
     DEFAULT:
       transport_url: null

cinder/values.yaml

@@ -1074,6 +1074,8 @@ conf:
       thunder-lock: true
       worker-reload-mercy: 80
       wsgi-file: /var/lib/openstack/bin/cinder-wsgi
+      stats: 0.0.0.0:1717
+      stats-http: true
   db_purge:
     before: 30
 

cloudkitty/values.yaml

@@ -555,6 +555,8 @@ conf:
       worker-reload-mercy: 80
       wsgi-file: /var/lib/openstack/bin/cloudkitty-api
       processes: 1
+      stats: 0.0.0.0:1717
+      stats-http: true
   cloudkitty:
     DEFAULT:
       log_config_append: /etc/cloudkitty/logging.conf

designate/values.yaml

@@ -560,6 +560,8 @@ conf:
       thunder-lock: true
       worker-reload-mercy: 80
       wsgi-file: /var/lib/openstack/bin/designate-api-wsgi
+      stats: 0.0.0.0:1717
+      stats-http: true
 
 # Names of secrets used by bootstrap and environmental checks
 secrets:

glance/values.yaml

@@ -430,6 +430,8 @@ conf:
       thunder-lock: true
       worker-reload-mercy: 80
       wsgi-file: /var/lib/openstack/bin/glance-wsgi-api
+      stats: 0.0.0.0:1717
+      stats-http: true
 
 network:
   api:

heat/templates/deployment-api.yaml

@@ -92,7 +92,11 @@ spec:
             httpGet:
               scheme: {{ tuple "orchestration" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
               path: /
+              {{- if .Values.pod.probes.api.heat_api.liveness.port }}
+              port: {{ .Values.pod.probes.api.heat_api.liveness.port }}
+              {{- else }}
               port: {{ tuple "orchestration" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+              {{- end }}
             initialDelaySeconds: 10
           volumeMounts:
             - name: pod-tmp

heat/templates/deployment-cfn.yaml

@@ -91,7 +91,11 @@ spec:
             httpGet:
               scheme: {{ tuple "cloudformation" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
               path: /
+              {{- if .Values.pod.probes.cfn.heat_cfn.liveness.port }}
+              port: {{ .Values.pod.probes.cfn.heat_cfn.liveness.port }}
+              {{- else }}
               port: {{ tuple "cloudformation" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+              {{- end }}
             initialDelaySeconds: 10
           volumeMounts:
             - name: pod-tmp

heat/values.yaml

@@ -487,6 +487,8 @@ conf:
       thunder-lock: true
       worker-reload-mercy: 80
       wsgi-file: /var/lib/openstack/bin/heat-wsgi-api
+      stats: 0.0.0.0:1717
+      stats-http: true
   heat_api_cfn_uwsgi:
     uwsgi:
       add-header: "Connection: close"
@@ -503,6 +505,8 @@ conf:
       thunder-lock: true
       worker-reload-mercy: 80
       wsgi-file: /var/lib/openstack/bin/heat-wsgi-api-cfn
+      stats: 0.0.0.0:1717
+      stats-http: true
 
 network:
   api:
@@ -1171,6 +1175,15 @@ pod:
         limits:
           memory: "1024Mi"
           cpu: "2000m"
+  probes:
+    api:
+      heat_api:
+        liveness:
+          port: 1717
+    cfn:
+      heat_cfn:
+        liveness:
+          port: 1717
 
 network_policy:
   heat:

magnum/values.yaml

@@ -184,6 +184,8 @@ conf:
       thunder-lock: true
       worker-reload-mercy: 80
       wsgi-file: /var/lib/openstack/bin/magnum-api-wsgi
+      stats: 0.0.0.0:1717
+      stats-http: true
 
 network:
   api:

manila/values.yaml

@@ -866,6 +866,8 @@ conf:
       thunder-lock: true
       worker-reload-mercy: 80
       module: "manila.wsgi.api:application"
+      stats: 0.0.0.0:1717
+      stats-http: true
 
 # Names of secrets used by bootstrap and environmental checks
 secrets:

neutron/templates/deployment-server.yaml

@@ -39,7 +39,11 @@ initialDelaySeconds: 30
 httpGet:
   scheme: {{ tuple "network" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
   path: /
+  {{- if .Values.pod.probes.server.server.liveness.port }}
+  port: {{ .Values.pod.probes.server.server.liveness.port }}
+  {{ else }}
   port: {{ tuple "network" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+  {{- end}}
 {{- end }}
 {{- end }}
 

neutron/values.yaml

@@ -529,6 +529,7 @@ pod:
             timeoutSeconds: 10
         liveness:
           enabled: true
+          port: 1717
           params:
             initialDelaySeconds: 60
             periodSeconds: 15
@@ -1387,6 +1388,8 @@ conf:
       thunder-lock: true
       worker-reload-mercy: 80
       wsgi-file: /var/lib/openstack/bin/neutron-api
+      stats: 0.0.0.0:1717
+      stats-http: true
   policy: {}
   api_audit_map:
     DEFAULT:

nova/values.yaml

@@ -1620,6 +1620,8 @@ conf:
       thunder-lock: true
       worker-reload-mercy: 80
       wsgi-file: /var/lib/openstack/bin/nova-api-wsgi
+      stats: 0.0.0.0:1717
+      stats-http: true
   nova_metadata_uwsgi:
     uwsgi:
       add-header: "Connection: close"
@@ -1636,6 +1638,8 @@ conf:
       thunder-lock: true
       worker-reload-mercy: 80
       wsgi-file: /var/lib/openstack/bin/nova-metadata-wsgi
+      stats: 0.0.0.0:1717
+      stats-http: true
 
 # Names of secrets used by bootstrap and environmental checks
 secrets:

octavia/values.yaml

@@ -401,6 +401,8 @@ conf:
       thunder-lock: true
       worker-reload-mercy: 80
       module: "octavia.wsgi.api:application"
+      stats: 0.0.0.0:1717
+      stats-http: true
 
 secrets:
   identity:

ovn/values.yaml

@@ -104,6 +104,8 @@ conf:
       thunder-lock: true
       worker-reload-mercy: 80
       wsgi-file: /var/lib/openstack/bin/neutron-ovn-network-logging-parser-wsgi
+      stats: 0.0.0.0:1717
+      stats-http: true
   vector: |
     [sources.file_logs]
     type = "file"

placement/templates/deployment.yaml

@@ -108,7 +108,11 @@ spec:
             httpGet:
               scheme: {{ tuple "placement" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
               path: /
+              {{- if .Values.pod.probes.placement.api.liveness.port }}
+              port: {{ .Values.pod.probes.placement.api.liveness.port }}
+              {{- else }}
               port: {{ tuple "placement" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+              {{- end }}
             initialDelaySeconds: 5
             periodSeconds: 10
           volumeMounts:

placement/values.yaml

@@ -153,6 +153,8 @@ conf:
       thunder-lock: true
       worker-reload-mercy: 80
       wsgi-file: /var/lib/openstack/bin/placement-api
+      stats: 0.0.0.0:1717
+      stats-http: true
 endpoints:
   cluster_domain_suffix: cluster.local
   local_image_registry:
@@ -374,6 +376,11 @@ pod:
         limits:
           memory: "1024Mi"
           cpu: "2000m"
+  probes:
+    placement:
+      api:
+        liveness:
+          port: 1717
 
 secrets:
   identity: