Add OSLO lock path to all OpenStack services

Add a dedicated writable emptyDir volume for OSLO's
file-based locking mechanism to all OpenStack services.

Affected charts:
aodh, barbican, blazer, ceilometer, cinder, cloudkitty, cyborg,
designate, glance, gnocchi, heat, ironic, keystone, magnum, manila,
masakari, mistral, monasca, neutron, nova, octavia, placement, tacker,
trove, watcher, and zaqar.

This ensures proper file locking functionality in Oslo libraries within
containerized environments and prevents lock file conflicts.

Assisted-by: Claude Code 2.0
Change-Id: I3ee46d9550bc6f2a6632bec748efe0be646a82b3
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>

aodh/templates/deployment-api.yaml

@@ -82,6 +82,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.aodh.oslo_concurrency.lock_path }}
             - name: wsgi-aodh
               mountPath: /var/www/cgi-bin/aodh
             - name: pod-etc-aodh
@@ -116,6 +118,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: wsgi-aodh
           emptyDir: {}
         - name: pod-etc-aodh

aodh/templates/deployment-evaluator.yaml

@@ -75,6 +75,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.aodh.oslo_concurrency.lock_path }}
             - name: pod-etc-aodh
               mountPath: /etc/aodh
             - name: aodh-etc
@@ -99,6 +101,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-aodh
           emptyDir: {}
         - name: aodh-etc

aodh/templates/deployment-listener.yaml

@@ -75,6 +75,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.aodh.oslo_concurrency.lock_path }}
             - name: pod-etc-aodh
               mountPath: /etc/aodh
             - name: aodh-etc
@@ -99,6 +101,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-aodh
           emptyDir: {}
         - name: aodh-etc

aodh/templates/deployment-notifier.yaml

@@ -75,6 +75,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.aodh.oslo_concurrency.lock_path }}
             - name: pod-etc-aodh
               mountPath: /etc/aodh
             - name: aodh-etc
@@ -99,6 +101,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-aodh
           emptyDir: {}
         - name: aodh-etc

aodh/values.yaml

@@ -459,6 +459,8 @@ conf:
       enable_proxy_headers_parsing: true
     oslo_policy:
       policy_file: /etc/aodh/policy.yaml
+    oslo_concurrency:
+      lock_path: /var/lock
     database:
       alarm_history_time_to_live: 86400
       max_retries: -1

barbican/templates/deployment-api.yaml

@@ -94,6 +94,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.barbican.oslo_concurrency.lock_path }}
             - name: etcbarbican
               mountPath: /etc/barbican
             - name: barbican-etc
@@ -134,6 +136,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: etcbarbican
           emptyDir: {}
         - name: barbican-etc

barbican/values.yaml

@@ -413,6 +413,8 @@ conf:
       bind_port: null
     oslo_policy:
       policy_file: /etc/barbican/policy.yaml
+    oslo_concurrency:
+      lock_path: /var/lock
     # When using the simple_crypto_plugin, a kek must be provided as:
     #   .conf.barbican.simple_crypto_plugin.kek
     # If no kek is provided, barbican will use a well-known default.

blazar/templates/deployment-api.yaml

@@ -97,6 +97,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.blazar.oslo_concurrency.lock_path }}
             - name: pod-etc-blazar
               mountPath: /etc/blazar
             - name: blazar-bin
@@ -131,6 +133,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-blazar
           emptyDir: {}
         - name: blazar-bin

blazar/templates/deployment-manager.yaml

@@ -68,6 +68,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.blazar.oslo_concurrency.lock_path }}
             - name: pod-etc-blazar
               mountPath: /etc/blazar
             - name: blazar-bin
@@ -94,6 +96,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-blazar
           emptyDir: {}
         - name: blazar-bin

blazar/values.yaml

@@ -623,6 +623,8 @@ conf:
       driver: messagingv2
     oslo_messaging_rabbit:
       rabbit_ha_queues: true
+    oslo_concurrency:
+      lock_path: /var/lock
     manager:
       plugins: physical.host.plugin,virtual.instance.plugin,flavor.instance.plugin,virtual.floatingip.plugin
     enforcement:

ceilometer/templates/daemonset-compute.yaml

@@ -66,6 +66,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.ceilometer.oslo_concurrency.lock_path }}
             - name: pod-etc-ceilometer
               mountPath: /etc/ceilometer
             - name: ceilometer-etc
@@ -119,6 +121,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-ceilometer
           emptyDir: {}
         - name: ceilometer-etc

ceilometer/templates/daemonset-ipmi.yaml

@@ -68,6 +68,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.ceilometer.oslo_concurrency.lock_path }}
             - name: pod-etc-ceilometer
               mountPath: /etc/ceilometer
             - name: ceilometer-etc
@@ -113,6 +115,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-ceilometer
           emptyDir: {}
         - name: ceilometer-etc

ceilometer/templates/deployment-central.yaml

@@ -64,6 +64,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.ceilometer.oslo_concurrency.lock_path }}
             - name: pod-etc-ceilometer
               mountPath: /etc/ceilometer
             - name: ceilometer-etc
@@ -106,6 +108,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-ceilometer
           emptyDir: {}
         - name: ceilometer-etc

ceilometer/templates/deployment-notification.yaml

@@ -64,6 +64,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.ceilometer.oslo_concurrency.lock_path }}
             - name: pod-etc-ceilometer
               mountPath: /etc/ceilometer
             - name: ceilometer-etc
@@ -108,6 +110,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-ceilometer
           emptyDir: {}
         - name: etc-ceilometer-meters

ceilometer/values.yaml

@@ -80,6 +80,8 @@ conf:
       topics:
         - notifications
         - profiler
+    oslo_concurrency:
+      lock_path: /var/lock
     cache:
       enabled: true
       backend: dogpile.cache.memcached

cinder/templates/deployment-api.yaml

@@ -116,6 +116,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.cinder.oslo_concurrency.lock_path }}
             - name: wsgi-cinder
               mountPath: /var/www/cgi-bin/cinder
             - name: cinder-bin
@@ -179,6 +181,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: wsgi-cinder
           emptyDir: {}
         - name: cinder-bin

cinder/templates/deployment-backup.yaml

@@ -168,6 +168,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.cinder.oslo_concurrency.lock_path }}
             - name: cinder-tmp
               mountPath: /var/lib/cinder/tmp
             - name: cinder-bin
@@ -293,6 +295,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: cinder-tmp
           emptyDir: {}
         - name: cinder-etc

cinder/templates/deployment-scheduler.yaml

@@ -84,6 +84,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.cinder.oslo_concurrency.lock_path }}
             - name: pod-var-cinder
               mountPath: {{ .Values.conf.cinder.DEFAULT.state_path }}
             - name: cinder-bin
@@ -121,6 +123,8 @@ spec:
           emptyDir: {}
         - name: pod-var-cinder
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: cinder-bin
           configMap:
             name: cinder-bin

cinder/templates/deployment-volume.yaml

@@ -162,6 +162,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.cinder.oslo_concurrency.lock_path }}
             - name: pod-var-cinder
               mountPath: {{ .Values.conf.cinder.DEFAULT.state_path }}
             - name: cinder-bin
@@ -297,6 +299,8 @@ spec:
           emptyDir: {}
         - name: pod-var-cinder
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: cinder-bin
           configMap:
             name: cinder-bin

cinder/values.yaml

@@ -885,7 +885,7 @@ conf:
     oslo_policy:
       policy_file: /etc/cinder/policy.yaml
     oslo_concurrency:
-      lock_path: "/var/lib/cinder/tmp"
+      lock_path: /var/lock
     oslo_messaging_notifications:
       driver: messagingv2
     oslo_middleware:

cloudkitty/templates/deployment-api.yaml

@@ -92,6 +92,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.cloudkitty.oslo_concurrency.lock_path }}
             - name: cloudkitty-bin
               mountPath: /tmp/cloudkitty-api.sh
               subPath: cloudkitty-api.sh
@@ -119,6 +121,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: etccloudkitty
           emptyDir: {}
         - name: cloudkitty-bin

cloudkitty/templates/deployment-processor.yaml

@@ -72,6 +72,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.cloudkitty.oslo_concurrency.lock_path }}
             - name: cloudkitty-bin
               mountPath: /tmp/cloudkitty-processor.sh
               subPath: cloudkitty-processor.sh
@@ -94,6 +96,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: etccloudkitty
           emptyDir: {}
         - name: cloudkitty-bin

cloudkitty/values.yaml

@@ -571,6 +571,8 @@ conf:
       service_type: rating
     database:
       max_retries: -1
+    oslo_concurrency:
+      lock_path: /var/lock
     collect:
       collector: gnocchi
     collector_gnocchi:

cyborg/templates/daemonset-agent.yaml

@@ -72,6 +72,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.cyborg.oslo_concurrency.lock_path }}
             - name: cyborg-bin
               mountPath: /tmp/cyborg-agent.sh
               subPath: cyborg-agent.sh
@@ -83,6 +85,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-shared
           emptyDir: {}
         - name: cyborg-bin

cyborg/templates/deployment-api.yaml

@@ -87,6 +87,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.cyborg.oslo_concurrency.lock_path }}
             - name: pod-var-cyborg
               mountPath: /var/lib/cyborg
             - name: cyborg-bin
@@ -109,6 +111,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-var-cyborg
           emptyDir: {}
         - name: cyborg-bin

cyborg/templates/deployment-conductor.yaml

@@ -70,6 +70,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.cyborg.oslo_concurrency.lock_path }}
             - name: cyborg-bin
               mountPath: /tmp/cyborg-conductor.sh
               subPath: cyborg-conductor.sh
@@ -86,6 +88,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: cyborg-bin
           configMap:
             name: cyborg-bin

cyborg/values.yaml

@@ -503,6 +503,8 @@ conf:
     oslo_messaging_rabbit:
       rabbit_ha_queues: true
       amqp_durable_queues: true
+    oslo_concurrency:
+      lock_path: /var/lock
     placement:
       auth_type: password
     nova:

designate/templates/deployment-api.yaml

@@ -75,6 +75,8 @@ spec:
               path: /
               port: {{ tuple "dns" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           volumeMounts:
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.designate.oslo_concurrency.lock_path }}
             - name: designate-bin
               mountPath: /tmp/designate-api.sh
               subPath: designate-api.sh
@@ -107,6 +109,8 @@ spec:
             {{- end }}
 {{ if $mounts_designate_api.volumeMounts }}{{ toYaml $mounts_designate_api.volumeMounts | indent 12 }}{{ end }}
       volumes:
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-designate
           emptyDir: {}
         - name: pod-var-cache-designate

designate/templates/deployment-central.yaml

@@ -60,6 +60,8 @@ spec:
             - bash
             - /tmp/designate-central.sh
           volumeMounts:
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.designate.oslo_concurrency.lock_path }}
             - name: designate-bin
               mountPath: /tmp/designate-central.sh
               subPath: designate-central.sh
@@ -88,6 +90,8 @@ spec:
             {{- end }}
 {{ if $mounts_designate_central.volumeMounts }}{{ toYaml $mounts_designate_central.volumeMounts | indent 12 }}{{ end }}
       volumes:
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-designate
           emptyDir: {}
         - name: pod-var-cache-designate

designate/templates/deployment-mdns.yaml

@@ -71,6 +71,8 @@ spec:
             - bash
             - /tmp/designate-mdns.sh
           volumeMounts:
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.designate.oslo_concurrency.lock_path }}
             - name: designate-bin
               mountPath: /tmp/designate-mdns.sh
               subPath: designate-mdns.sh
@@ -99,6 +101,8 @@ spec:
             {{- end }}
 {{ if $mounts_designate_mdns.volumeMounts }}{{ toYaml $mounts_designate_mdns.volumeMounts | indent 12 }}{{ end }}
       volumes:
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-designate
           emptyDir: {}
         - name: pod-var-cache-designate

designate/templates/deployment-producer.yaml

@@ -60,6 +60,8 @@ spec:
             - bash
             - /tmp/designate-producer.sh
           volumeMounts:
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.designate.oslo_concurrency.lock_path }}
             - name: designate-bin
               mountPath: /tmp/designate-producer.sh
               subPath: designate-producer.sh
@@ -88,6 +90,8 @@ spec:
             {{- end }}
 {{ if $mounts_designate_producer.volumeMounts }}{{ toYaml $mounts_designate_producer.volumeMounts | indent 12 }}{{ end }}
       volumes:
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-designate
           emptyDir: {}
         - name: pod-var-cache-designate

designate/templates/deployment-sink.yaml

@@ -60,6 +60,8 @@ spec:
             - bash
             - /tmp/designate-sink.sh
           volumeMounts:
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.designate.oslo_concurrency.lock_path }}
             - name: designate-bin
               mountPath: /tmp/designate-sink.sh
               subPath: designate-sink.sh
@@ -84,6 +86,8 @@ spec:
             {{- end }}
 {{ if $mounts_designate_sink.volumeMounts }}{{ toYaml $mounts_designate_sink.volumeMounts | indent 12 }}{{ end }}
       volumes:
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-designate
           emptyDir: {}
         - name: pod-var-cache-designate

designate/templates/deployment-worker.yaml

@@ -85,6 +85,8 @@ spec:
             - bash
             - /tmp/designate-worker.sh
           volumeMounts:
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.designate.oslo_concurrency.lock_path }}
             - name: designate-bin
               mountPath: /tmp/designate-worker.sh
               subPath: designate-worker.sh
@@ -113,6 +115,8 @@ spec:
             {{- end }}
 {{ if $mounts_designate_worker.volumeMounts }}{{ toYaml $mounts_designate_worker.volumeMounts | indent 12 }}{{ end }}
       volumes:
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-designate
           emptyDir: {}
         - name: pod-var-cache-designate

designate/values.yaml

@@ -476,6 +476,8 @@ conf:
       enable_proxy_headers_parsing: true
     oslo_policy:
       policy_file: /etc/designate/policy.yaml
+    oslo_concurrency:
+      lock_path: /var/lock
     database:
       max_retries: -1
     storage:sqlalchemy:

freezer/templates/deployment-api.yaml

@@ -91,6 +91,8 @@ spec:
             - name: freezer-api
               containerPort: {{ tuple "backup" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           volumeMounts:
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.freezer.oslo_concurrency.lock_path }}
             - name: freezer-bin
               mountPath: /tmp/freezer-api.sh
               subPath: freezer-api.sh
@@ -115,6 +117,8 @@ spec:
 {{- dict "enabled" .Values.tls.oslo_db "name" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal "path" "/etc/mysql/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
 {{- dict "enabled" .Values.tls.identity "name" .Values.secrets.tls.backup.api.internal "path" "/etc/freezer/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
       volumes:
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: freezer-bin
           configMap:
             name: freezer-bin

freezer/values.yaml

@@ -390,6 +390,8 @@ conf:
       max_retries: -1
     oslo_policy:
       policy_file: /etc/freezer/policy.yaml
+    oslo_concurrency:
+      lock_path: /var/lock
     storage:
       backend: sqlalchemy
       driver: sqlalchemy

glance/templates/deployment-api.yaml

@@ -191,6 +191,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.glance.oslo_concurrency.lock_path }}
             - name: glance-tmp
               mountPath: /var/lib/glance/tmp
             - name: etcglance
@@ -311,6 +313,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: glance-tmp
           emptyDir: {}
         - name: etcglance

glance/values.yaml

@@ -303,7 +303,7 @@ conf:
     database:
       max_retries: -1
     oslo_concurrency:
-      lock_path: "/var/lib/glance/tmp"
+      lock_path: /var/lock
     oslo_messaging_notifications:
       driver: messagingv2
     oslo_messaging_rabbit:

gnocchi/templates/daemonset-metricd.yaml

@@ -75,6 +75,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.gnocchi.oslo_concurrency.lock_path }}
             - name: pod-etc-gnocchi
               mountPath: /etc/gnocchi
             - name: gnocchi-etc
@@ -103,6 +105,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-gnocchi
           emptyDir: {}
         - name: gnocchi-etc

gnocchi/templates/daemonset-statsd.yaml

@@ -77,6 +77,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.gnocchi.oslo_concurrency.lock_path }}
             - name: pod-etc-gnocchi
               mountPath: /etc/gnocchi
             - name: gnocchi-etc
@@ -109,6 +111,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-gnocchi
           emptyDir: {}
         - name: gnocchi-etc

gnocchi/templates/deployment-api.yaml

@@ -92,6 +92,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.gnocchi.oslo_concurrency.lock_path }}
             - name: pod-etc-gnocchi
               mountPath: /etc/gnocchi
             - name: gnocchi-etc
@@ -130,6 +132,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-gnocchi
           emptyDir: {}
         - name: gnocchi-etc

gnocchi/values.yaml

@@ -467,6 +467,8 @@ conf:
       auth_type: password
       auth_version: v3
       memcache_security_strategy: ENCRYPT
+    oslo_concurrency:
+      lock_path: /var/lock
 
 ceph_client:
   configmap: ceph-etc

heat/templates/deployment-api.yaml

@@ -101,6 +101,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.heat.oslo_concurrency.lock_path }}
             - name: pod-etc-heat
               mountPath: /etc/heat
             - name: wsgi-heat
@@ -151,6 +153,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-heat
           emptyDir: {}
         - name: wsgi-heat

heat/templates/deployment-cfn.yaml

@@ -100,6 +100,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.heat.oslo_concurrency.lock_path }}
             - name: pod-etc-heat
               mountPath: /etc/heat
             - name: wsgi-heat
@@ -149,6 +151,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-heat
           emptyDir: {}
         - name: wsgi-heat

heat/templates/deployment-engine.yaml

@@ -90,6 +90,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.heat.oslo_concurrency.lock_path }}
             - name: pod-etc-heat
               mountPath: /etc/heat
             - name: heat-bin
@@ -117,6 +119,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-heat
           emptyDir: {}
         - name: heat-bin

heat/values.yaml

@@ -369,6 +369,8 @@ conf:
       rabbit_ha_queues: True
     oslo_policy:
       policy_file: /etc/heat/policy.yaml
+    oslo_concurrency:
+      lock_path: /var/lock
   api_audit_map:
     DEFAULT:
       target_endpoint_type: None

ironic/templates/deployment-api.yaml

@@ -103,6 +103,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.ironic.oslo_concurrency.lock_path }}
             - name: ironic-bin
               mountPath: /tmp/ironic-api.sh
               subPath: ironic-api.sh
@@ -127,6 +129,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: ironic-bin
           configMap:
             name: ironic-bin

ironic/templates/statefulset-conductor.yaml

@@ -157,6 +157,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.ironic.oslo_concurrency.lock_path }}
             - name: ironic-bin
               mountPath: /tmp/ironic-conductor.sh
               subPath: ironic-conductor.sh
@@ -235,6 +237,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-shared
           emptyDir: {}
         - name: pod-var-cache-ironic

ironic/values.yaml

@@ -152,6 +152,8 @@ conf:
       auth_url: null
     oslo_policy:
       policy_file: /etc/ironic/policy.yaml
+    oslo_concurrency:
+      lock_path: /var/lock
   logging:
     loggers:
       keys:

keystone/templates/deployment-api.yaml

@@ -89,6 +89,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.keystone.oslo_concurrency.lock_path }}
             - name: etckeystone
               mountPath: /etc/keystone
             - name: logs-apache
@@ -163,6 +165,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: etckeystone
           emptyDir: {}
         - name: logs-apache

keystone/values.yaml

@@ -558,6 +558,8 @@ conf:
       enable_proxy_headers_parsing: true
     oslo_policy:
       policy_file: /etc/keystone/policy.yaml
+    oslo_concurrency:
+      lock_path: /var/lock
     security_compliance:
       # NOTE(vdrok): The following two options have effect only for SQL backend
       lockout_failure_attempts: 5

magnum/templates/deployment-api.yaml

@@ -83,6 +83,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.magnum.oslo_concurrency.lock_path }}
             - name: magnum-bin
               mountPath: /tmp/magnum-api.sh
               subPath: magnum-api.sh
@@ -119,12 +121,12 @@ spec:
               subPath: kubeconfig.conf
               readOnly: true
             {{- end }}
-            - name: magnum-lock-path
-              mountPath: {{ .Values.conf.magnum.oslo_concurrency.lock_path }}
 {{ if $mounts_magnum_api.volumeMounts }}{{ toYaml $mounts_magnum_api.volumeMounts | indent 12 }}{{ end }}
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-magnum
           emptyDir: {}
         - name: pod-var-cache-magnum
@@ -137,7 +139,5 @@ spec:
           secret:
             secretName: magnum-etc
             defaultMode: 0444
-        - name: magnum-lock-path
-          emptyDir: {}
 {{ if $mounts_magnum_api.volumes }}{{ toYaml $mounts_magnum_api.volumes | indent 8 }}{{ end }}
 {{- end }}

magnum/templates/statefulset-conductor.yaml

@@ -86,6 +86,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.magnum.oslo_concurrency.lock_path }}
             - name: magnum-bin
               mountPath: /tmp/magnum-conductor.sh
               subPath: magnum-conductor.sh
@@ -114,14 +116,14 @@ spec:
               readOnly: true
             - name: pod-shared
               mountPath: /tmp/pod-shared
-            - name: magnum-lock-path
-              mountPath: {{ .Values.conf.magnum.oslo_concurrency.lock_path }}
             - name: magnum-certificate-cache
               mountPath: {{ .Values.conf.magnum.cluster.temp_cache_dir }}
 {{ if $mounts_magnum_conductor.volumeMounts }}{{ toYaml $mounts_magnum_conductor.volumeMounts | indent 12 }}{{ end }}
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-magnum
           emptyDir: {}
         - name: pod-shared
@@ -134,8 +136,6 @@ spec:
           secret:
             secretName: magnum-etc
             defaultMode: 0444
-        - name: magnum-lock-path
-          emptyDir: {}
         - name: magnum-certificate-cache
           emptyDir: {}
 {{ if $mounts_magnum_conductor.volumes }}{{ toYaml $mounts_magnum_conductor.volumes | indent 8 }}{{ end }}

magnum/values.yaml

@@ -89,7 +89,7 @@ conf:
     oslo_messaging_notifications:
       driver: messaging
     oslo_concurrency:
-      lock_path: /var/lib/magnum/tmp
+      lock_path: /var/lock
     oslo_policy:
       policy_file: /etc/magnum/policy.yaml
     certificates:

manila/templates/deployment-api.yaml

@@ -89,6 +89,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.manila.oslo_concurrency.lock_path }}
             - name: state-tmp
               mountPath: /var/lib/manila
             - name: etcmanila
@@ -127,6 +129,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: state-tmp
           emptyDir: {}
         - name: etcmanila

manila/templates/deployment-data.yaml

@@ -74,6 +74,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.manila.oslo_concurrency.lock_path }}
             - name: etcmanila
               mountPath: /etc/manila
             - name: state-tmp
@@ -104,6 +106,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: state-tmp
           emptyDir: {}
         - name: etcmanila

manila/templates/deployment-scheduler.yaml

@@ -74,6 +74,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.manila.oslo_concurrency.lock_path }}
             - name: etcmanila
               mountPath: /etc/manila
             - name: state-tmp
@@ -104,6 +106,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: state-tmp
           emptyDir: {}
         - name: etcmanila

manila/templates/deployment-share.yaml

@@ -115,6 +115,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.manila.oslo_concurrency.lock_path }}
             - name: pod-shared
               mountPath: /tmp/pod-shared
             - name: etcmanila
@@ -183,6 +185,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-shared
           emptyDir: {}
         - name: state-tmp

manila/values.yaml

@@ -756,7 +756,7 @@ conf:
     oslo_policy:
       policy_file: /etc/manila/policy.yaml
     oslo_concurrency:
-      lock_path: /var/lib/manila/tmp
+      lock_path: /var/lock
     oslo_messaging_notifications:
       driver: messagingv2
     oslo_middleware:

masakari/templates/daemonset-host-monitor.yaml

@@ -95,6 +95,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.masakari.oslo_concurrency.lock_path }}
             - name: pod-shared
               mountPath: /tmp/pod-shared
             - name: masakari-bin
@@ -117,6 +119,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-shared
           emptyDir: {}
         - name: masakarietc

masakari/templates/daemonset-instance-monitor.yaml

@@ -94,6 +94,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.masakari.oslo_concurrency.lock_path }}
             - name: pod-shared
               mountPath: /tmp/pod-shared
             - name: masakari-bin
@@ -111,6 +113,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-shared
           emptyDir: {}
         - name: masakarietc

masakari/templates/daemonset-introspective-instance-monitor.yaml

@@ -78,14 +78,14 @@ spec:
 {{ tuple $envAll "masakari_introspective_instance_monitor" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.masakari_introspective_instance_monitor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
 {{ dict "envAll" $envAll "application" "masakari" "container" "masakari_introspective_instance_monitor" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
-          command:
-            - /tmp/masakari-introspective-instance-monitor.sh
-            - start
           env:
             - name: COMPUTE_NODE_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
+          command:
+            - /tmp/masakari-introspective-instance-monitor.sh
+            - start
           lifecycle:
             preStop:
               exec:
@@ -95,6 +95,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.masakari.oslo_concurrency.lock_path }}
             - name: pod-shared
               mountPath: /tmp/pod-shared
             - name: masakari-bin
@@ -117,6 +119,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-shared
           emptyDir: {}
         - name: masakarietc

masakari/templates/daemonset-process-monitor.yaml

@@ -94,6 +94,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.masakari.oslo_concurrency.lock_path }}
             - name: etcmasakari
               mountPath: /etc/masakari
             - name: pod-shared
@@ -111,6 +113,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: etcmasakari
           emptyDir: {}
         - name: pod-shared

masakari/templates/deployment-api.yaml

@@ -92,6 +92,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.masakari.oslo_concurrency.lock_path }}
             - name: masakari-bin
               mountPath: /tmp/masakari-api.sh
               subPath: masakari-api.sh
@@ -106,6 +108,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: etcmasakari
           emptyDir: {}
         - name: masakari-bin

masakari/templates/deployment-engine.yaml

@@ -72,6 +72,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.masakari.oslo_concurrency.lock_path }}
             - name: masakari-bin
               mountPath: /tmp/masakari-engine.sh
               subPath: masakari-engine.sh
@@ -85,6 +87,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: etcmasakari
           emptyDir: {}
         - name: masakari-bin

masakari/values.yaml

@@ -583,6 +583,8 @@ conf:
       service_type: instance-ha
     database:
       max_retries: -1
+    oslo_concurrency:
+      lock_path: /var/lock
     # Connection string is evaluated though the endpoints for taskflow.
     taskflow:
       connection: null

mistral/templates/deployment-api.yaml

@@ -79,6 +79,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.mistral.oslo_concurrency.lock_path }}
             - name: pod-etc-mistral
               mountPath: /etc/mistral
             - name: mistral-bin
@@ -103,6 +105,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-mistral
           emptyDir: {}
         - name: mistral-bin

mistral/templates/deployment-executor.yaml

@@ -63,6 +63,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.mistral.oslo_concurrency.lock_path }}
             - name: pod-etc-mistral
               mountPath: /etc/mistral
             - name: mistral-bin
@@ -83,6 +85,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-mistral
           emptyDir: {}
         - name: mistral-bin

mistral/templates/statefulset-engine.yaml

@@ -60,6 +60,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.mistral.oslo_concurrency.lock_path }}
             - name: pod-etc-mistral
               mountPath: /etc/mistral
             - name: mistral-bin
@@ -80,6 +82,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-mistral
           emptyDir: {}
         - name: mistral-bin

mistral/templates/statefulset-event-engine.yaml

@@ -60,6 +60,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.mistral.oslo_concurrency.lock_path }}
             - name: pod-etc-mistral
               mountPath: /etc/mistral
             - name: mistral-bin
@@ -80,6 +82,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-mistral
           emptyDir: {}
         - name: mistral-bin

mistral/values.yaml

@@ -437,6 +437,8 @@ conf:
       memcache_security_strategy: ENCRYPT
     oslo_policy:
       policy_file: /etc/mistral/policy.yaml
+    oslo_concurrency:
+      lock_path: /var/lock
   logging:
     loggers:
       keys:

neutron/templates/daemonset-bagpipe-bgp.yaml

@@ -102,6 +102,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.neutron.oslo_concurrency.lock_path }}
             - name: pod-var-neutron
               mountPath: {{ .Values.conf.neutron.DEFAULT.state_path }}
             - name: neutron-bin
@@ -150,6 +152,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-var-neutron
           emptyDir: {}
         - name: neutron-bin

neutron/templates/daemonset-bgp-dragent.yaml

@@ -86,6 +86,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.neutron.oslo_concurrency.lock_path }}
             - name: pod-var-neutron
               mountPath: {{ .Values.conf.neutron.DEFAULT.state_path }}
             - name: neutron-bin
@@ -143,6 +145,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-var-neutron
           emptyDir: {}
         - name: neutron-bin

neutron/templates/daemonset-dhcp-agent.yaml

@@ -193,6 +193,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.neutron.oslo_concurrency.lock_path }}
             - name: pod-shared
               mountPath: /tmp/pod-shared
             - name: pod-var-neutron
@@ -279,6 +281,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-var-neutron
           emptyDir: {}
         - name: neutron-bin

neutron/templates/daemonset-l2gw-agent.yaml

@@ -118,6 +118,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.neutron.oslo_concurrency.lock_path }}
             - name: pod-var-neutron
               mountPath: {{ .Values.conf.neutron.DEFAULT.state_path }}
             - name: neutron-bin
@@ -150,6 +152,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-var-neutron
           emptyDir: {}
         - name: neutron-bin

neutron/templates/daemonset-l3-agent.yaml

@@ -181,6 +181,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.neutron.oslo_concurrency.lock_path }}
             - name: pod-shared
               mountPath: /tmp/pod-shared
             - name: pod-var-neutron
@@ -262,6 +264,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-var-neutron
           emptyDir: {}
         - name: neutron-bin

neutron/templates/daemonset-lb-agent.yaml

@@ -159,6 +159,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.neutron.oslo_concurrency.lock_path }}
             - name: pod-var-neutron
               mountPath: {{ .Values.conf.neutron.DEFAULT.state_path }}
             - name: neutron-bin
@@ -216,6 +218,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-var-neutron
           emptyDir: {}
         - name: pod-shared

neutron/templates/daemonset-metadata-agent.yaml

@@ -140,6 +140,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.neutron.oslo_concurrency.lock_path }}
             - name: pod-var-neutron
               mountPath: {{ .Values.conf.neutron.DEFAULT.state_path }}
             - name: neutron-bin
@@ -211,6 +213,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-var-neutron
           emptyDir: {}
         - name: neutron-bin

neutron/templates/daemonset-netns-cleanup-cron.yaml

@@ -83,6 +83,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.neutron.oslo_concurrency.lock_path }}
             - name: neutron-bin
               mountPath: /tmp/neutron-netns-cleanup-cron.sh
               subPath: neutron-netns-cleanup-cron.sh
@@ -145,6 +147,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-var-neutron
           emptyDir: {}
         - name: neutron-bin

neutron/templates/daemonset-neutron-ovn-vpn-agent.yaml

@@ -157,6 +157,8 @@ spec:
               mountPath: /run
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.neutron.oslo_concurrency.lock_path }}
             - name: pod-var-neutron
               mountPath: {{ .Values.conf.neutron.DEFAULT.state_path }}
             - name: neutron-bin
@@ -232,6 +234,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-var-neutron
           emptyDir: {}
         - name: run

neutron/templates/daemonset-ovn-metadata-agent.yaml

@@ -157,6 +157,8 @@ spec:
               mountPath: /run/openvswitch
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.neutron.oslo_concurrency.lock_path }}
             - name: pod-var-neutron
               mountPath: {{ .Values.conf.neutron.DEFAULT.state_path }}
             - name: neutron-bin
@@ -228,6 +230,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-var-neutron
           emptyDir: {}
         - name: run-openvswitch

neutron/templates/daemonset-ovs-agent.yaml

@@ -221,6 +221,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.neutron.oslo_concurrency.lock_path }}
             - name: pod-var-neutron
               mountPath: {{ .Values.conf.neutron.DEFAULT.state_path }}
             - name: neutron-bin
@@ -296,6 +298,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-var-neutron
           emptyDir: {}
         - name: varlibopenvswitch

neutron/templates/daemonset-sriov-agent.yaml

@@ -163,6 +163,8 @@ spec:
               name: host-sys-devices
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.neutron.oslo_concurrency.lock_path }}
             - name: pod-var-neutron
               mountPath: {{ .Values.conf.neutron.DEFAULT.state_path }}
             - name: neutron-bin
@@ -236,6 +238,8 @@ spec:
             path: /sys/devices
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-var-neutron
           emptyDir: {}
         - name: pod-shared

neutron/templates/deployment-ironic-agent.yaml

@@ -96,6 +96,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.neutron.oslo_concurrency.lock_path }}
             - name: pod-var-neutron
               mountPath: {{ .Values.conf.neutron.DEFAULT.state_path }}
             - name: pod-shared
@@ -126,6 +128,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-var-neutron
           emptyDir: {}
         - name: pod-shared

neutron/templates/deployment-rpc_server.yaml

@@ -118,6 +118,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.neutron.oslo_concurrency.lock_path }}
             - name: pod-shared
               mountPath: /tmp/pod-shared
             - name: pod-var-neutron
@@ -209,6 +211,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-shared
           emptyDir: {}
         {{- if .Values.manifests.certificates }}

neutron/templates/deployment-server.yaml

@@ -164,6 +164,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.neutron.oslo_concurrency.lock_path }}
             - name: neutron-bin
               mountPath: /tmp/nginx.sh
               subPath: nginx.sh
@@ -305,6 +307,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-shared
           emptyDir: {}
         {{- if .Values.manifests.certificates }}

neutron/values.yaml

@@ -1982,7 +1982,7 @@ conf:
       # 'network.backend' to sane defaults.
       interface_driver: null
     oslo_concurrency:
-      lock_path: /var/lib/neutron/tmp
+      lock_path: /var/lock
     database:
       max_retries: -1
     agent:

nova/templates/daemonset-compute.yaml

@@ -338,6 +338,8 @@ spec:
               mountPath: /dev/pts
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.nova.oslo_concurrency.lock_path }}
             - name: nova-bin
               mountPath: /tmp/nova-compute.sh
               subPath: nova-compute.sh
@@ -517,6 +519,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: nova-bin
           configMap:
             name: nova-bin

nova/templates/deployment-api-metadata.yaml

@@ -126,6 +126,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.nova.oslo_concurrency.lock_path }}
             - name: nova-bin
               mountPath: /tmp/nova-api-metadata.sh
               subPath: nova-api-metadata.sh
@@ -213,6 +215,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         {{- if .Values.manifests.certificates }}
         - name: wsgi-nova
           emptyDir: {}

nova/templates/deployment-api-osapi.yaml

@@ -105,6 +105,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.nova.oslo_concurrency.lock_path }}
             - name: pod-var-nova
               mountPath: /var/lib/nova
             - name: nova-bin
@@ -159,6 +161,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         {{- if .Values.manifests.certificates }}
         - name: wsgi-nova
           emptyDir: {}

nova/templates/deployment-conductor.yaml

@@ -111,6 +111,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.nova.oslo_concurrency.lock_path }}
             - name: nova-bin
               mountPath: /tmp/nova-conductor.sh
               subPath: nova-conductor.sh
@@ -143,6 +145,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: nova-bin
           configMap:
             name: nova-bin

nova/templates/deployment-novncproxy.yaml

@@ -137,6 +137,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.nova.oslo_concurrency.lock_path }}
             - name: nova-bin
               mountPath: /tmp/nova-console-proxy.sh
               subPath: nova-console-proxy.sh
@@ -170,6 +172,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: nova-bin
           configMap:
             name: nova-bin

nova/templates/deployment-scheduler.yaml

@@ -111,6 +111,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.nova.oslo_concurrency.lock_path }}
             - name: nova-bin
               mountPath: /tmp/nova-scheduler.sh
               subPath: nova-scheduler.sh
@@ -143,6 +145,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: nova-bin
           configMap:
             name: nova-bin

nova/templates/deployment-serialproxy.yaml

@@ -120,6 +120,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.nova.oslo_concurrency.lock_path }}
             - name: nova-bin
               mountPath: /tmp/nova-console-proxy.sh
               subPath: nova-console-proxy.sh
@@ -148,6 +150,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: nova-bin
           configMap:
             name: nova-bin

nova/templates/deployment-spiceproxy.yaml

@@ -129,6 +129,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.nova.oslo_concurrency.lock_path }}
             - name: nova-bin
               mountPath: /tmp/nova-console-proxy.sh
               subPath: nova-console-proxy.sh
@@ -156,6 +158,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: nova-bin
           configMap:
             name: nova-bin

nova/templates/statefulset-compute-ironic.yaml

@@ -70,6 +70,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.nova.oslo_concurrency.lock_path }}
             - name: nova-bin
               mountPath: /tmp/nova-compute-ironic.sh
               subPath: nova-compute-ironic.sh
@@ -105,6 +107,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: nova-bin
           configMap:
             name: nova-bin

nova/values.yaml

@@ -1461,7 +1461,7 @@ conf:
     oslo_policy:
       policy_file: /etc/nova/policy.yaml
     oslo_concurrency:
-      lock_path: /var/lib/nova/tmp
+      lock_path: /var/lock
     oslo_middleware:
       enable_proxy_headers_parsing: true
     glance:

octavia/templates/daemonset-health-manager.yaml

@@ -103,6 +103,8 @@ spec:
                   - /tmp/octavia-health-manager.sh
                   - stop
           volumeMounts:
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.octavia.oslo_concurrency.lock_path }}
             - name: pod-etc-octavia
               mountPath: /etc/octavia
             - name: octavia-bin
@@ -121,6 +123,8 @@ spec:
             {{- end }}
 {{ if $mounts_octavia_health_manager.volumeMounts }}{{ toYaml $mounts_octavia_health_manager.volumeMounts | indent 12 }}{{ end }}
       volumes:
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-octavia
           emptyDir: {}
         - name: octavia-bin

octavia/templates/daemonset-worker.yaml

@@ -103,6 +103,8 @@ spec:
                   - /tmp/octavia-worker.sh
                   - stop
           volumeMounts:
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.octavia.oslo_concurrency.lock_path }}
             - name: pod-etc-octavia
               mountPath: /etc/octavia
             - name: octavia-bin
@@ -121,6 +123,8 @@ spec:
             {{- end }}
 {{ if $mounts_octavia_worker.volumeMounts }}{{ toYaml $mounts_octavia_worker.volumeMounts | indent 12 }}{{ end }}
       volumes:
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-octavia
           emptyDir: {}
         - name: octavia-bin

octavia/templates/deployment-api.yaml

@@ -91,6 +91,8 @@ spec:
 {{ dict "envAll" $envAll "component" "api" "container" "octavia-api" "type" "readiness" "probeTemplate" (include "octaviaApiReadinessProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 10 }}
 {{ dict "envAll" $envAll "component" "api" "container" "octavia-api" "type" "liveness" "probeTemplate" (include "octaviaApiLivenessProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 10 }}
           volumeMounts:
+            - name: oslo-lock-path
+              mountPath: {{ .Values.conf.octavia.oslo_concurrency.lock_path }}
             - name: pod-etc-octavia
               mountPath: /etc/octavia
             - name: octavia-bin
@@ -117,6 +119,8 @@ spec:
             {{- end }}
 {{ if $mounts_octavia_api.volumeMounts }}{{ toYaml $mounts_octavia_api.volumeMounts | indent 12 }}{{ end }}
       volumes:
+        - name: oslo-lock-path
+          emptyDir: {}
         - name: pod-etc-octavia
           emptyDir: {}
         - name: octavia-bin