From 645bfa08a5d2f8d352cf5186c577eef9640f8bdf Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Thu, 12 Feb 2026 22:12:08 -1000 Subject: [PATCH] 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 --- aodh/templates/deployment-api.yaml | 4 ++++ aodh/templates/deployment-evaluator.yaml | 4 ++++ aodh/templates/deployment-listener.yaml | 4 ++++ aodh/templates/deployment-notifier.yaml | 4 ++++ aodh/values.yaml | 2 ++ barbican/templates/deployment-api.yaml | 4 ++++ barbican/values.yaml | 2 ++ blazar/templates/deployment-api.yaml | 4 ++++ blazar/templates/deployment-manager.yaml | 4 ++++ blazar/values.yaml | 2 ++ ceilometer/templates/daemonset-compute.yaml | 4 ++++ ceilometer/templates/daemonset-ipmi.yaml | 4 ++++ ceilometer/templates/deployment-central.yaml | 4 ++++ ceilometer/templates/deployment-notification.yaml | 4 ++++ ceilometer/values.yaml | 2 ++ cinder/templates/deployment-api.yaml | 4 ++++ cinder/templates/deployment-backup.yaml | 4 ++++ cinder/templates/deployment-scheduler.yaml | 4 ++++ cinder/templates/deployment-volume.yaml | 4 ++++ cinder/values.yaml | 2 +- cloudkitty/templates/deployment-api.yaml | 4 ++++ cloudkitty/templates/deployment-processor.yaml | 4 ++++ cloudkitty/values.yaml | 2 ++ cyborg/templates/daemonset-agent.yaml | 4 ++++ cyborg/templates/deployment-api.yaml | 4 ++++ cyborg/templates/deployment-conductor.yaml | 4 ++++ cyborg/values.yaml | 2 ++ designate/templates/deployment-api.yaml | 4 ++++ designate/templates/deployment-central.yaml | 4 ++++ designate/templates/deployment-mdns.yaml | 4 ++++ designate/templates/deployment-producer.yaml | 4 ++++ designate/templates/deployment-sink.yaml | 4 ++++ designate/templates/deployment-worker.yaml | 4 ++++ designate/values.yaml | 2 ++ freezer/templates/deployment-api.yaml | 4 ++++ freezer/values.yaml | 2 ++ glance/templates/deployment-api.yaml | 4 ++++ glance/values.yaml | 2 +- gnocchi/templates/daemonset-metricd.yaml | 4 ++++ gnocchi/templates/daemonset-statsd.yaml | 4 ++++ gnocchi/templates/deployment-api.yaml | 4 ++++ gnocchi/values.yaml | 2 ++ heat/templates/deployment-api.yaml | 4 ++++ heat/templates/deployment-cfn.yaml | 4 ++++ heat/templates/deployment-engine.yaml | 4 ++++ heat/values.yaml | 2 ++ ironic/templates/deployment-api.yaml | 4 ++++ ironic/templates/statefulset-conductor.yaml | 4 ++++ ironic/values.yaml | 2 ++ keystone/templates/deployment-api.yaml | 4 ++++ keystone/values.yaml | 2 ++ magnum/templates/deployment-api.yaml | 8 ++++---- magnum/templates/statefulset-conductor.yaml | 8 ++++---- magnum/values.yaml | 2 +- manila/templates/deployment-api.yaml | 4 ++++ manila/templates/deployment-data.yaml | 4 ++++ manila/templates/deployment-scheduler.yaml | 4 ++++ manila/templates/deployment-share.yaml | 4 ++++ manila/values.yaml | 2 +- masakari/templates/daemonset-host-monitor.yaml | 4 ++++ masakari/templates/daemonset-instance-monitor.yaml | 4 ++++ .../daemonset-introspective-instance-monitor.yaml | 10 +++++++--- masakari/templates/daemonset-process-monitor.yaml | 4 ++++ masakari/templates/deployment-api.yaml | 4 ++++ masakari/templates/deployment-engine.yaml | 4 ++++ masakari/values.yaml | 2 ++ mistral/templates/deployment-api.yaml | 4 ++++ mistral/templates/deployment-executor.yaml | 4 ++++ mistral/templates/statefulset-engine.yaml | 4 ++++ mistral/templates/statefulset-event-engine.yaml | 4 ++++ mistral/values.yaml | 2 ++ neutron/templates/daemonset-bagpipe-bgp.yaml | 4 ++++ neutron/templates/daemonset-bgp-dragent.yaml | 4 ++++ neutron/templates/daemonset-dhcp-agent.yaml | 4 ++++ neutron/templates/daemonset-l2gw-agent.yaml | 4 ++++ neutron/templates/daemonset-l3-agent.yaml | 4 ++++ neutron/templates/daemonset-lb-agent.yaml | 4 ++++ neutron/templates/daemonset-metadata-agent.yaml | 4 ++++ neutron/templates/daemonset-netns-cleanup-cron.yaml | 4 ++++ neutron/templates/daemonset-neutron-ovn-vpn-agent.yaml | 4 ++++ neutron/templates/daemonset-ovn-metadata-agent.yaml | 4 ++++ neutron/templates/daemonset-ovs-agent.yaml | 4 ++++ neutron/templates/daemonset-sriov-agent.yaml | 4 ++++ neutron/templates/deployment-ironic-agent.yaml | 4 ++++ neutron/templates/deployment-rpc_server.yaml | 4 ++++ neutron/templates/deployment-server.yaml | 4 ++++ neutron/values.yaml | 2 +- nova/templates/daemonset-compute.yaml | 4 ++++ nova/templates/deployment-api-metadata.yaml | 4 ++++ nova/templates/deployment-api-osapi.yaml | 4 ++++ nova/templates/deployment-conductor.yaml | 4 ++++ nova/templates/deployment-novncproxy.yaml | 4 ++++ nova/templates/deployment-scheduler.yaml | 4 ++++ nova/templates/deployment-serialproxy.yaml | 4 ++++ nova/templates/deployment-spiceproxy.yaml | 4 ++++ nova/templates/statefulset-compute-ironic.yaml | 4 ++++ nova/values.yaml | 2 +- octavia/templates/daemonset-health-manager.yaml | 4 ++++ octavia/templates/daemonset-worker.yaml | 4 ++++ octavia/templates/deployment-api.yaml | 4 ++++ octavia/templates/deployment-driver-agent.yaml | 8 ++++++++ octavia/templates/deployment-housekeeping.yaml | 4 ++++ octavia/values.yaml | 2 ++ placement/templates/deployment.yaml | 4 ++++ placement/values.yaml | 2 ++ releasenotes/notes/common-d6d7b93fcc7296e9.yaml | 6 ++++++ tacker/templates/deployment-conductor.yaml | 4 ++++ tacker/templates/deployment-server.yaml | 4 ++++ tacker/values.yaml | 2 ++ trove/templates/deployment-api.yaml | 10 +++++++--- trove/templates/deployment-conductor.yaml | 10 +++++++--- trove/templates/deployment-taskmanager.yaml | 10 +++++++--- trove/values.yaml | 2 +- watcher/templates/deployment-api.yaml | 8 ++++++++ watcher/templates/deployment-applier.yaml | 8 ++++++++ watcher/templates/statefulset-decision-engine.yaml | 8 ++++++++ watcher/values.yaml | 2 ++ zaqar/templates/deployment-api.yaml | 4 ++++ zaqar/values.yaml | 2 ++ 119 files changed, 447 insertions(+), 27 deletions(-) create mode 100644 releasenotes/notes/common-d6d7b93fcc7296e9.yaml diff --git a/aodh/templates/deployment-api.yaml b/aodh/templates/deployment-api.yaml index 769195515a..6aa6d63be5 100644 --- a/aodh/templates/deployment-api.yaml +++ b/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 diff --git a/aodh/templates/deployment-evaluator.yaml b/aodh/templates/deployment-evaluator.yaml index 2f6b88614c..1c4d9e4c99 100644 --- a/aodh/templates/deployment-evaluator.yaml +++ b/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 diff --git a/aodh/templates/deployment-listener.yaml b/aodh/templates/deployment-listener.yaml index cca9fb1669..a7f2e99465 100644 --- a/aodh/templates/deployment-listener.yaml +++ b/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 diff --git a/aodh/templates/deployment-notifier.yaml b/aodh/templates/deployment-notifier.yaml index eed5d80b0c..468c1b29b0 100644 --- a/aodh/templates/deployment-notifier.yaml +++ b/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 diff --git a/aodh/values.yaml b/aodh/values.yaml index 92d4638cc5..1a993411fb 100644 --- a/aodh/values.yaml +++ b/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 diff --git a/barbican/templates/deployment-api.yaml b/barbican/templates/deployment-api.yaml index 54c14b7a86..90b63668a9 100644 --- a/barbican/templates/deployment-api.yaml +++ b/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 diff --git a/barbican/values.yaml b/barbican/values.yaml index cce1a4fa28..a8fc3b8668 100644 --- a/barbican/values.yaml +++ b/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. diff --git a/blazar/templates/deployment-api.yaml b/blazar/templates/deployment-api.yaml index 2e73eb393f..e4ac2018b5 100644 --- a/blazar/templates/deployment-api.yaml +++ b/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 diff --git a/blazar/templates/deployment-manager.yaml b/blazar/templates/deployment-manager.yaml index 8e659a7ca8..ef760e5ce6 100644 --- a/blazar/templates/deployment-manager.yaml +++ b/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 diff --git a/blazar/values.yaml b/blazar/values.yaml index 5540acde77..d214f9379f 100644 --- a/blazar/values.yaml +++ b/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: diff --git a/ceilometer/templates/daemonset-compute.yaml b/ceilometer/templates/daemonset-compute.yaml index 07536d443d..2fae79c8d2 100644 --- a/ceilometer/templates/daemonset-compute.yaml +++ b/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 diff --git a/ceilometer/templates/daemonset-ipmi.yaml b/ceilometer/templates/daemonset-ipmi.yaml index 619a2168f4..06bd9135b6 100644 --- a/ceilometer/templates/daemonset-ipmi.yaml +++ b/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 diff --git a/ceilometer/templates/deployment-central.yaml b/ceilometer/templates/deployment-central.yaml index 15fae9591b..f21ab18c80 100644 --- a/ceilometer/templates/deployment-central.yaml +++ b/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 diff --git a/ceilometer/templates/deployment-notification.yaml b/ceilometer/templates/deployment-notification.yaml index 33b2c382c7..97e3c67d5e 100644 --- a/ceilometer/templates/deployment-notification.yaml +++ b/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 diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml index 78ff02ed9d..25e40f58f9 100644 --- a/ceilometer/values.yaml +++ b/ceilometer/values.yaml @@ -80,6 +80,8 @@ conf: topics: - notifications - profiler + oslo_concurrency: + lock_path: /var/lock cache: enabled: true backend: dogpile.cache.memcached diff --git a/cinder/templates/deployment-api.yaml b/cinder/templates/deployment-api.yaml index 0e135c0fb0..919db67d37 100644 --- a/cinder/templates/deployment-api.yaml +++ b/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 diff --git a/cinder/templates/deployment-backup.yaml b/cinder/templates/deployment-backup.yaml index f45f583a85..37ecd22f12 100644 --- a/cinder/templates/deployment-backup.yaml +++ b/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 diff --git a/cinder/templates/deployment-scheduler.yaml b/cinder/templates/deployment-scheduler.yaml index 3321958e79..12b996123a 100644 --- a/cinder/templates/deployment-scheduler.yaml +++ b/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 diff --git a/cinder/templates/deployment-volume.yaml b/cinder/templates/deployment-volume.yaml index d1cd918866..88c991b54f 100644 --- a/cinder/templates/deployment-volume.yaml +++ b/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 diff --git a/cinder/values.yaml b/cinder/values.yaml index e0c79e4500..0b51754995 100644 --- a/cinder/values.yaml +++ b/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: diff --git a/cloudkitty/templates/deployment-api.yaml b/cloudkitty/templates/deployment-api.yaml index 7750b0b84c..e38dad830a 100644 --- a/cloudkitty/templates/deployment-api.yaml +++ b/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 diff --git a/cloudkitty/templates/deployment-processor.yaml b/cloudkitty/templates/deployment-processor.yaml index 5e4246e3b1..80841f17d9 100644 --- a/cloudkitty/templates/deployment-processor.yaml +++ b/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 diff --git a/cloudkitty/values.yaml b/cloudkitty/values.yaml index ba68042a31..f49628264f 100644 --- a/cloudkitty/values.yaml +++ b/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: diff --git a/cyborg/templates/daemonset-agent.yaml b/cyborg/templates/daemonset-agent.yaml index ad1eb252b3..43f36c8b6f 100644 --- a/cyborg/templates/daemonset-agent.yaml +++ b/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 diff --git a/cyborg/templates/deployment-api.yaml b/cyborg/templates/deployment-api.yaml index 0ba7885224..8acd6f31bc 100644 --- a/cyborg/templates/deployment-api.yaml +++ b/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 diff --git a/cyborg/templates/deployment-conductor.yaml b/cyborg/templates/deployment-conductor.yaml index 9afcbe17d4..537c4e589b 100644 --- a/cyborg/templates/deployment-conductor.yaml +++ b/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 diff --git a/cyborg/values.yaml b/cyborg/values.yaml index 297806fd7e..d2762baa00 100644 --- a/cyborg/values.yaml +++ b/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: diff --git a/designate/templates/deployment-api.yaml b/designate/templates/deployment-api.yaml index 1576c108ec..52386aafcd 100644 --- a/designate/templates/deployment-api.yaml +++ b/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 diff --git a/designate/templates/deployment-central.yaml b/designate/templates/deployment-central.yaml index 40dab4f33b..9bcdecfb6d 100644 --- a/designate/templates/deployment-central.yaml +++ b/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 diff --git a/designate/templates/deployment-mdns.yaml b/designate/templates/deployment-mdns.yaml index 53608ebdc4..56f16ce5ff 100644 --- a/designate/templates/deployment-mdns.yaml +++ b/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 diff --git a/designate/templates/deployment-producer.yaml b/designate/templates/deployment-producer.yaml index dd4d3235fd..9acfacdb5a 100644 --- a/designate/templates/deployment-producer.yaml +++ b/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 diff --git a/designate/templates/deployment-sink.yaml b/designate/templates/deployment-sink.yaml index 913360444e..2575904e4e 100644 --- a/designate/templates/deployment-sink.yaml +++ b/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 diff --git a/designate/templates/deployment-worker.yaml b/designate/templates/deployment-worker.yaml index e03a570e7b..08f376a048 100644 --- a/designate/templates/deployment-worker.yaml +++ b/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 diff --git a/designate/values.yaml b/designate/values.yaml index e5e3d0fc6d..caa4824ad6 100644 --- a/designate/values.yaml +++ b/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: diff --git a/freezer/templates/deployment-api.yaml b/freezer/templates/deployment-api.yaml index 2af217883d..fa918a84ee 100644 --- a/freezer/templates/deployment-api.yaml +++ b/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 diff --git a/freezer/values.yaml b/freezer/values.yaml index 6343c341de..f470269cc8 100644 --- a/freezer/values.yaml +++ b/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 diff --git a/glance/templates/deployment-api.yaml b/glance/templates/deployment-api.yaml index d402eddadd..fbcbf0a1bb 100644 --- a/glance/templates/deployment-api.yaml +++ b/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 diff --git a/glance/values.yaml b/glance/values.yaml index a1ca402a25..3750935424 100644 --- a/glance/values.yaml +++ b/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: diff --git a/gnocchi/templates/daemonset-metricd.yaml b/gnocchi/templates/daemonset-metricd.yaml index 174a38448e..7888c92115 100644 --- a/gnocchi/templates/daemonset-metricd.yaml +++ b/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 diff --git a/gnocchi/templates/daemonset-statsd.yaml b/gnocchi/templates/daemonset-statsd.yaml index b8f2f7f87b..5aaa86bf09 100644 --- a/gnocchi/templates/daemonset-statsd.yaml +++ b/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 diff --git a/gnocchi/templates/deployment-api.yaml b/gnocchi/templates/deployment-api.yaml index beb43a249d..efff4f5967 100644 --- a/gnocchi/templates/deployment-api.yaml +++ b/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 diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml index 48d5bb8884..f4f43bf26d 100644 --- a/gnocchi/values.yaml +++ b/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 diff --git a/heat/templates/deployment-api.yaml b/heat/templates/deployment-api.yaml index 296bf667ef..8cb0c7571b 100644 --- a/heat/templates/deployment-api.yaml +++ b/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 diff --git a/heat/templates/deployment-cfn.yaml b/heat/templates/deployment-cfn.yaml index 92941a6179..5eb5bb15bd 100644 --- a/heat/templates/deployment-cfn.yaml +++ b/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 diff --git a/heat/templates/deployment-engine.yaml b/heat/templates/deployment-engine.yaml index 76cb8702ce..70924025e8 100644 --- a/heat/templates/deployment-engine.yaml +++ b/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 diff --git a/heat/values.yaml b/heat/values.yaml index 852367901b..59161f05a8 100644 --- a/heat/values.yaml +++ b/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 diff --git a/ironic/templates/deployment-api.yaml b/ironic/templates/deployment-api.yaml index decbffeba2..c0fde9da1e 100644 --- a/ironic/templates/deployment-api.yaml +++ b/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 diff --git a/ironic/templates/statefulset-conductor.yaml b/ironic/templates/statefulset-conductor.yaml index 76f0d5a781..fcb65c1488 100644 --- a/ironic/templates/statefulset-conductor.yaml +++ b/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 diff --git a/ironic/values.yaml b/ironic/values.yaml index b2df83ab74..efc17b05aa 100644 --- a/ironic/values.yaml +++ b/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: diff --git a/keystone/templates/deployment-api.yaml b/keystone/templates/deployment-api.yaml index 19cb7a68ee..863dc7be57 100644 --- a/keystone/templates/deployment-api.yaml +++ b/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 diff --git a/keystone/values.yaml b/keystone/values.yaml index a32b46f3b2..799d4b4750 100644 --- a/keystone/values.yaml +++ b/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 diff --git a/magnum/templates/deployment-api.yaml b/magnum/templates/deployment-api.yaml index 005d715f45..d5c7314959 100644 --- a/magnum/templates/deployment-api.yaml +++ b/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 }} diff --git a/magnum/templates/statefulset-conductor.yaml b/magnum/templates/statefulset-conductor.yaml index e8f220a659..ad2c230f75 100644 --- a/magnum/templates/statefulset-conductor.yaml +++ b/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 }} diff --git a/magnum/values.yaml b/magnum/values.yaml index 2f3fb99f42..f73c87fae5 100644 --- a/magnum/values.yaml +++ b/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: diff --git a/manila/templates/deployment-api.yaml b/manila/templates/deployment-api.yaml index 51c7e1f80b..cdb117f49e 100644 --- a/manila/templates/deployment-api.yaml +++ b/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 diff --git a/manila/templates/deployment-data.yaml b/manila/templates/deployment-data.yaml index 8d70f7448d..8be7e2d1c9 100644 --- a/manila/templates/deployment-data.yaml +++ b/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 diff --git a/manila/templates/deployment-scheduler.yaml b/manila/templates/deployment-scheduler.yaml index 94a70e1fc3..f9e1d7988f 100644 --- a/manila/templates/deployment-scheduler.yaml +++ b/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 diff --git a/manila/templates/deployment-share.yaml b/manila/templates/deployment-share.yaml index 1a3e546d8b..1f339af6ac 100644 --- a/manila/templates/deployment-share.yaml +++ b/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 diff --git a/manila/values.yaml b/manila/values.yaml index dd8be4acea..2b55b0660d 100644 --- a/manila/values.yaml +++ b/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: diff --git a/masakari/templates/daemonset-host-monitor.yaml b/masakari/templates/daemonset-host-monitor.yaml index a119220a6e..e37eef3e1b 100644 --- a/masakari/templates/daemonset-host-monitor.yaml +++ b/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 diff --git a/masakari/templates/daemonset-instance-monitor.yaml b/masakari/templates/daemonset-instance-monitor.yaml index cabd3f51ed..eca68c4f0d 100644 --- a/masakari/templates/daemonset-instance-monitor.yaml +++ b/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 diff --git a/masakari/templates/daemonset-introspective-instance-monitor.yaml b/masakari/templates/daemonset-introspective-instance-monitor.yaml index ec3e049768..523437a485 100644 --- a/masakari/templates/daemonset-introspective-instance-monitor.yaml +++ b/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 diff --git a/masakari/templates/daemonset-process-monitor.yaml b/masakari/templates/daemonset-process-monitor.yaml index 3274870a65..0a8b07d50b 100644 --- a/masakari/templates/daemonset-process-monitor.yaml +++ b/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 diff --git a/masakari/templates/deployment-api.yaml b/masakari/templates/deployment-api.yaml index 1f0d0e927c..948f5fda04 100644 --- a/masakari/templates/deployment-api.yaml +++ b/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 diff --git a/masakari/templates/deployment-engine.yaml b/masakari/templates/deployment-engine.yaml index 6d36e56c43..e0471a3d72 100644 --- a/masakari/templates/deployment-engine.yaml +++ b/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 diff --git a/masakari/values.yaml b/masakari/values.yaml index a579eb705a..5b02294f6b 100644 --- a/masakari/values.yaml +++ b/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 diff --git a/mistral/templates/deployment-api.yaml b/mistral/templates/deployment-api.yaml index 77426ac9ec..4cd8e7521e 100644 --- a/mistral/templates/deployment-api.yaml +++ b/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 diff --git a/mistral/templates/deployment-executor.yaml b/mistral/templates/deployment-executor.yaml index 676fb1755c..41ca11a93c 100644 --- a/mistral/templates/deployment-executor.yaml +++ b/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 diff --git a/mistral/templates/statefulset-engine.yaml b/mistral/templates/statefulset-engine.yaml index 0029e0cd84..49fad8fbbd 100644 --- a/mistral/templates/statefulset-engine.yaml +++ b/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 diff --git a/mistral/templates/statefulset-event-engine.yaml b/mistral/templates/statefulset-event-engine.yaml index 045a9ed722..b1223ebca0 100644 --- a/mistral/templates/statefulset-event-engine.yaml +++ b/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 diff --git a/mistral/values.yaml b/mistral/values.yaml index 35ceb96514..ed2a98aee1 100644 --- a/mistral/values.yaml +++ b/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: diff --git a/neutron/templates/daemonset-bagpipe-bgp.yaml b/neutron/templates/daemonset-bagpipe-bgp.yaml index e9b59eaa74..8be4edac16 100644 --- a/neutron/templates/daemonset-bagpipe-bgp.yaml +++ b/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 diff --git a/neutron/templates/daemonset-bgp-dragent.yaml b/neutron/templates/daemonset-bgp-dragent.yaml index 8db3af06d0..d1fa6d6af7 100644 --- a/neutron/templates/daemonset-bgp-dragent.yaml +++ b/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 diff --git a/neutron/templates/daemonset-dhcp-agent.yaml b/neutron/templates/daemonset-dhcp-agent.yaml index 27d2ed0e25..6ab84c6c2d 100644 --- a/neutron/templates/daemonset-dhcp-agent.yaml +++ b/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 diff --git a/neutron/templates/daemonset-l2gw-agent.yaml b/neutron/templates/daemonset-l2gw-agent.yaml index 88233bb663..66c3631c0d 100644 --- a/neutron/templates/daemonset-l2gw-agent.yaml +++ b/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 diff --git a/neutron/templates/daemonset-l3-agent.yaml b/neutron/templates/daemonset-l3-agent.yaml index ff15b15b2d..d107a299bf 100644 --- a/neutron/templates/daemonset-l3-agent.yaml +++ b/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 diff --git a/neutron/templates/daemonset-lb-agent.yaml b/neutron/templates/daemonset-lb-agent.yaml index 9e6202b5bd..270de98825 100644 --- a/neutron/templates/daemonset-lb-agent.yaml +++ b/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 diff --git a/neutron/templates/daemonset-metadata-agent.yaml b/neutron/templates/daemonset-metadata-agent.yaml index 1fad23c232..057db91749 100644 --- a/neutron/templates/daemonset-metadata-agent.yaml +++ b/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 diff --git a/neutron/templates/daemonset-netns-cleanup-cron.yaml b/neutron/templates/daemonset-netns-cleanup-cron.yaml index 674f6db545..cd80f251fa 100644 --- a/neutron/templates/daemonset-netns-cleanup-cron.yaml +++ b/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 diff --git a/neutron/templates/daemonset-neutron-ovn-vpn-agent.yaml b/neutron/templates/daemonset-neutron-ovn-vpn-agent.yaml index 4e79395bab..f0c1697cdf 100644 --- a/neutron/templates/daemonset-neutron-ovn-vpn-agent.yaml +++ b/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 diff --git a/neutron/templates/daemonset-ovn-metadata-agent.yaml b/neutron/templates/daemonset-ovn-metadata-agent.yaml index a5ba157511..7bc60e6adb 100644 --- a/neutron/templates/daemonset-ovn-metadata-agent.yaml +++ b/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 diff --git a/neutron/templates/daemonset-ovs-agent.yaml b/neutron/templates/daemonset-ovs-agent.yaml index 28be6db98c..54a3412848 100644 --- a/neutron/templates/daemonset-ovs-agent.yaml +++ b/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 diff --git a/neutron/templates/daemonset-sriov-agent.yaml b/neutron/templates/daemonset-sriov-agent.yaml index ccb7c8bc8a..64d264b959 100644 --- a/neutron/templates/daemonset-sriov-agent.yaml +++ b/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 diff --git a/neutron/templates/deployment-ironic-agent.yaml b/neutron/templates/deployment-ironic-agent.yaml index 0a43cb7668..bf916021e5 100644 --- a/neutron/templates/deployment-ironic-agent.yaml +++ b/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 diff --git a/neutron/templates/deployment-rpc_server.yaml b/neutron/templates/deployment-rpc_server.yaml index 3b3473a700..46289f4bef 100644 --- a/neutron/templates/deployment-rpc_server.yaml +++ b/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 }} diff --git a/neutron/templates/deployment-server.yaml b/neutron/templates/deployment-server.yaml index d0a26f694a..bc426f95c5 100644 --- a/neutron/templates/deployment-server.yaml +++ b/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 }} diff --git a/neutron/values.yaml b/neutron/values.yaml index 884d24fd4b..d40e05ff79 100644 --- a/neutron/values.yaml +++ b/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: diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml index 4cc2cc5f86..ed478c02a1 100644 --- a/nova/templates/daemonset-compute.yaml +++ b/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 diff --git a/nova/templates/deployment-api-metadata.yaml b/nova/templates/deployment-api-metadata.yaml index 8d20239b9d..d2192a0073 100644 --- a/nova/templates/deployment-api-metadata.yaml +++ b/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: {} diff --git a/nova/templates/deployment-api-osapi.yaml b/nova/templates/deployment-api-osapi.yaml index 6ce6b09125..c209bd3e53 100644 --- a/nova/templates/deployment-api-osapi.yaml +++ b/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: {} diff --git a/nova/templates/deployment-conductor.yaml b/nova/templates/deployment-conductor.yaml index 22a5777b52..e7eec4d861 100644 --- a/nova/templates/deployment-conductor.yaml +++ b/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 diff --git a/nova/templates/deployment-novncproxy.yaml b/nova/templates/deployment-novncproxy.yaml index 4de2e9ae75..faa6277586 100644 --- a/nova/templates/deployment-novncproxy.yaml +++ b/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 diff --git a/nova/templates/deployment-scheduler.yaml b/nova/templates/deployment-scheduler.yaml index ddce194a3d..108349f6bf 100644 --- a/nova/templates/deployment-scheduler.yaml +++ b/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 diff --git a/nova/templates/deployment-serialproxy.yaml b/nova/templates/deployment-serialproxy.yaml index d600b993d5..dff99a4c3c 100644 --- a/nova/templates/deployment-serialproxy.yaml +++ b/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 diff --git a/nova/templates/deployment-spiceproxy.yaml b/nova/templates/deployment-spiceproxy.yaml index 5bb4dd2317..0923d29fcb 100644 --- a/nova/templates/deployment-spiceproxy.yaml +++ b/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 diff --git a/nova/templates/statefulset-compute-ironic.yaml b/nova/templates/statefulset-compute-ironic.yaml index d2df22d7e8..f31cfeed87 100644 --- a/nova/templates/statefulset-compute-ironic.yaml +++ b/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 diff --git a/nova/values.yaml b/nova/values.yaml index b81ecad10c..bff804c78e 100644 --- a/nova/values.yaml +++ b/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: diff --git a/octavia/templates/daemonset-health-manager.yaml b/octavia/templates/daemonset-health-manager.yaml index 06afc18e74..ee08f12f40 100644 --- a/octavia/templates/daemonset-health-manager.yaml +++ b/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 diff --git a/octavia/templates/daemonset-worker.yaml b/octavia/templates/daemonset-worker.yaml index 4455f84b94..6fea327fde 100644 --- a/octavia/templates/daemonset-worker.yaml +++ b/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 diff --git a/octavia/templates/deployment-api.yaml b/octavia/templates/deployment-api.yaml index 62bad25809..18c4855d4f 100644 --- a/octavia/templates/deployment-api.yaml +++ b/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 diff --git a/octavia/templates/deployment-driver-agent.yaml b/octavia/templates/deployment-driver-agent.yaml index 79880d6f3a..18b91b2612 100644 --- a/octavia/templates/deployment-driver-agent.yaml +++ b/octavia/templates/deployment-driver-agent.yaml @@ -75,6 +75,10 @@ spec: - /tmp/octavia-driver-agent.sh - stop volumeMounts: + - name: pod-tmp + mountPath: /tmp + - name: oslo-lock-path + mountPath: {{ .Values.conf.octavia.oslo_concurrency.lock_path }} - name: pod-etc-octavia mountPath: /etc/octavia - name: octavia-bin @@ -97,6 +101,10 @@ spec: mountPath: /var/run/ovn {{ if $mounts_octavia_driver_agent.volumeMounts }}{{ toYaml $mounts_octavia_driver_agent.volumeMounts | indent 12 }}{{ end }} volumes: + - name: pod-tmp + emptyDir: {} + - name: oslo-lock-path + emptyDir: {} - name: pod-etc-octavia emptyDir: {} - name: run-openvswitch diff --git a/octavia/templates/deployment-housekeeping.yaml b/octavia/templates/deployment-housekeeping.yaml index d514232e7a..262f922391 100644 --- a/octavia/templates/deployment-housekeeping.yaml +++ b/octavia/templates/deployment-housekeeping.yaml @@ -72,6 +72,8 @@ spec: - /tmp/octavia-housekeeping.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 @@ -90,6 +92,8 @@ spec: {{- end }} {{ if $mounts_octavia_housekeeping.volumeMounts }}{{ toYaml $mounts_octavia_housekeeping.volumeMounts | indent 12 }}{{ end }} volumes: + - name: oslo-lock-path + emptyDir: {} - name: pod-etc-octavia emptyDir: {} - name: octavia-bin diff --git a/octavia/values.yaml b/octavia/values.yaml index aa11399419..e036ec1a12 100644 --- a/octavia/values.yaml +++ b/octavia/values.yaml @@ -301,6 +301,8 @@ conf: driver: messagingv2 oslo_policy: policy_file: /etc/octavia/policy.yaml + oslo_concurrency: + lock_path: /var/lock house_keeping: load_balancer_expiry_age: 3600 amphora_expiry_age: 3600 diff --git a/placement/templates/deployment.yaml b/placement/templates/deployment.yaml index 9cf1b07ef3..28057ad33f 100644 --- a/placement/templates/deployment.yaml +++ b/placement/templates/deployment.yaml @@ -118,6 +118,8 @@ spec: volumeMounts: - name: pod-tmp mountPath: /tmp + - name: oslo-lock-path + mountPath: {{ .Values.conf.placement.oslo_concurrency.lock_path }} - name: wsgi-placement mountPath: /var/www/cgi-bin/placement - name: placement-bin @@ -156,6 +158,8 @@ spec: volumes: - name: pod-tmp emptyDir: {} + - name: oslo-lock-path + emptyDir: {} - name: wsgi-placement emptyDir: {} - name: placement-bin diff --git a/placement/values.yaml b/placement/values.yaml index 2ca9cd8b8c..1b3c5cf695 100644 --- a/placement/values.yaml +++ b/placement/values.yaml @@ -77,6 +77,8 @@ conf: auth_type: password memcache_security_strategy: ENCRYPT service_type: placement + oslo_concurrency: + lock_path: /var/lock logging: loggers: keys: diff --git a/releasenotes/notes/common-d6d7b93fcc7296e9.yaml b/releasenotes/notes/common-d6d7b93fcc7296e9.yaml new file mode 100644 index 0000000000..54b4323e33 --- /dev/null +++ b/releasenotes/notes/common-d6d7b93fcc7296e9.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + Added emptyDir mounted at /var/lock and set OSLO_LOCK_PATH env var to + this path for oslo.concurrency support in all OpenStack services. +... diff --git a/tacker/templates/deployment-conductor.yaml b/tacker/templates/deployment-conductor.yaml index ebf278189c..a297ff5a0a 100644 --- a/tacker/templates/deployment-conductor.yaml +++ b/tacker/templates/deployment-conductor.yaml @@ -89,6 +89,8 @@ spec: mountPath: /tmp/tacker-conductor.sh subPath: tacker-conductor.sh readOnly: true + - name: oslo-lock-path + mountPath: {{ .Values.conf.tacker.oslo_concurrency.lock_path }} ports: - name: conductor containerPort: 5672 @@ -111,4 +113,6 @@ spec: configMap: name: tacker-bin defaultMode: 0555 + - name: oslo-lock-path + emptyDir: {} {{- end }} diff --git a/tacker/templates/deployment-server.yaml b/tacker/templates/deployment-server.yaml index 72eaa68b73..5f707de13c 100644 --- a/tacker/templates/deployment-server.yaml +++ b/tacker/templates/deployment-server.yaml @@ -75,6 +75,8 @@ spec: mountPath: /tmp/tacker-server.sh subPath: tacker-server.sh readOnly: true + - name: oslo-lock-path + mountPath: {{ .Values.conf.tacker.oslo_concurrency.lock_path }} ports: - name: t-api containerPort: 9890 @@ -97,4 +99,6 @@ spec: configMap: name: tacker-bin defaultMode: 0555 + - name: oslo-lock-path + emptyDir: {} {{- end }} diff --git a/tacker/values.yaml b/tacker/values.yaml index c4f07fb6e4..d48a85664d 100644 --- a/tacker/values.yaml +++ b/tacker/values.yaml @@ -445,6 +445,8 @@ conf: port: 9890 oslo_messaging_notifications: driver: noop + oslo_concurrency: + lock_path: /var/lock glance_store: filesystem_store_datadir: /var/lib/tacker/csar_files server: diff --git a/trove/templates/deployment-api.yaml b/trove/templates/deployment-api.yaml index defe563044..6a7b803d58 100644 --- a/trove/templates/deployment-api.yaml +++ b/trove/templates/deployment-api.yaml @@ -79,13 +79,13 @@ spec: {{ tuple $envAll "trove_api" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ dict "envAll" $envAll "application" "trove_api" "container" "trove_api" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }} - command: - - /tmp/trove-api.sh - - start env: {{- with $env := dict "ksUserSecret" .Values.secrets.identity.trove }} {{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} + command: + - /tmp/trove-api.sh + - start ports: - name: t-api containerPort: {{ tuple "database" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} @@ -94,6 +94,8 @@ spec: volumeMounts: - name: pod-tmp mountPath: /tmp + - name: oslo-lock-path + mountPath: {{ .Values.conf.trove.oslo_concurrency.lock_path }} - name: trove-bin mountPath: /tmp/trove-api.sh subPath: trove-api.sh @@ -118,6 +120,8 @@ spec: volumes: - name: pod-tmp emptyDir: {} + - name: oslo-lock-path + emptyDir: {} - name: trove-bin configMap: name: trove-bin diff --git a/trove/templates/deployment-conductor.yaml b/trove/templates/deployment-conductor.yaml index d289ef46bf..84afabc463 100644 --- a/trove/templates/deployment-conductor.yaml +++ b/trove/templates/deployment-conductor.yaml @@ -64,16 +64,18 @@ spec: {{ tuple $envAll "trove_conductor" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ dict "envAll" $envAll "application" "trove_conductor" "container" "trove_conductor" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }} - command: - - /tmp/trove-conductor.sh - - start env: {{- with $env := dict "ksUserSecret" .Values.secrets.identity.trove }} {{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} + command: + - /tmp/trove-conductor.sh + - start volumeMounts: - name: pod-tmp mountPath: /tmp + - name: oslo-lock-path + mountPath: {{ .Values.conf.trove.oslo_concurrency.lock_path }} - name: trove-bin mountPath: /tmp/trove-conductor.sh subPath: trove-conductor.sh @@ -94,6 +96,8 @@ spec: volumes: - name: pod-tmp emptyDir: {} + - name: oslo-lock-path + emptyDir: {} - name: trove-bin configMap: name: trove-bin diff --git a/trove/templates/deployment-taskmanager.yaml b/trove/templates/deployment-taskmanager.yaml index 42aeab0a69..6332b8638f 100644 --- a/trove/templates/deployment-taskmanager.yaml +++ b/trove/templates/deployment-taskmanager.yaml @@ -64,16 +64,18 @@ spec: {{ tuple $envAll "trove_taskmanager" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.taskmanager | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ dict "envAll" $envAll "application" "trove_taskmanager" "container" "trove_taskmanager" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }} - command: - - /tmp/trove-taskmanager.sh - - start env: {{- with $env := dict "ksUserSecret" .Values.secrets.identity.trove }} {{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} + command: + - /tmp/trove-taskmanager.sh + - start volumeMounts: - name: pod-tmp mountPath: /tmp + - name: oslo-lock-path + mountPath: {{ .Values.conf.trove.oslo_concurrency.lock_path }} - name: trove-bin mountPath: /tmp/trove-taskmanager.sh subPath: trove-taskmanager.sh @@ -94,6 +96,8 @@ spec: volumes: - name: pod-tmp emptyDir: {} + - name: oslo-lock-path + emptyDir: {} - name: trove-bin configMap: name: trove-bin diff --git a/trove/values.yaml b/trove/values.yaml index 03c3b7257a..280740b34a 100644 --- a/trove/values.yaml +++ b/trove/values.yaml @@ -358,7 +358,7 @@ conf: oslo_messaging_rabbit: rabbit_ha_queues: true oslo_concurrency: - lock_path: /var/lib/trove/tmp + lock_path: /var/lock oslo_policy: policy_file: /etc/trove/policy.yaml logging: diff --git a/watcher/templates/deployment-api.yaml b/watcher/templates/deployment-api.yaml index f086e91ba2..0f353b587d 100644 --- a/watcher/templates/deployment-api.yaml +++ b/watcher/templates/deployment-api.yaml @@ -76,6 +76,10 @@ spec: path: / port: {{ tuple "infra-optim" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} volumeMounts: + - name: pod-tmp + mountPath: /tmp + - name: oslo-lock-path + mountPath: {{ .Values.conf.watcher.oslo_concurrency.lock_path }} - name: pod-etc-watcher mountPath: /etc/watcher - name: watcher-bin @@ -96,6 +100,10 @@ spec: readOnly: true {{ if $mounts_watcher_api.volumeMounts }}{{ toYaml $mounts_watcher_api.volumeMounts | indent 12 }}{{ end }} volumes: + - name: pod-tmp + emptyDir: {} + - name: oslo-lock-path + emptyDir: {} - name: pod-etc-watcher emptyDir: {} - name: watcher-bin diff --git a/watcher/templates/deployment-applier.yaml b/watcher/templates/deployment-applier.yaml index 4c44ad5edf..2217e93d22 100644 --- a/watcher/templates/deployment-applier.yaml +++ b/watcher/templates/deployment-applier.yaml @@ -60,6 +60,10 @@ spec: command: - /tmp/watcher-applier.sh volumeMounts: + - name: pod-tmp + mountPath: /tmp + - name: oslo-lock-path + mountPath: {{ .Values.conf.watcher.oslo_concurrency.lock_path }} - name: pod-etc-watcher mountPath: /etc/watcher - name: watcher-bin @@ -76,6 +80,10 @@ spec: readOnly: true {{ if $mounts_watcher_applier.volumeMounts }}{{ toYaml $mounts_watcher_applier.volumeMounts | indent 12 }}{{ end }} volumes: + - name: pod-tmp + emptyDir: {} + - name: oslo-lock-path + emptyDir: {} - name: pod-etc-watcher emptyDir: {} - name: watcher-bin diff --git a/watcher/templates/statefulset-decision-engine.yaml b/watcher/templates/statefulset-decision-engine.yaml index de4ddbb069..f0a8410c5d 100644 --- a/watcher/templates/statefulset-decision-engine.yaml +++ b/watcher/templates/statefulset-decision-engine.yaml @@ -58,6 +58,10 @@ spec: command: - /tmp/watcher-decision-engine.sh volumeMounts: + - name: pod-tmp + mountPath: /tmp + - name: oslo-lock-path + mountPath: {{ .Values.conf.watcher.oslo_concurrency.lock_path }} - name: pod-etc-watcher mountPath: /etc/watcher - name: watcher-bin @@ -74,6 +78,10 @@ spec: readOnly: true {{ if $mounts_watcher_decision_engine.volumeMounts }}{{ toYaml $mounts_watcher_decision_engine.volumeMounts | indent 12 }}{{ end }} volumes: + - name: pod-tmp + emptyDir: {} + - name: oslo-lock-path + emptyDir: {} - name: pod-etc-watcher emptyDir: {} - name: watcher-bin diff --git a/watcher/values.yaml b/watcher/values.yaml index 400b872256..320c154731 100644 --- a/watcher/values.yaml +++ b/watcher/values.yaml @@ -355,6 +355,8 @@ conf: certfile: null keyfile: null insecure: false + oslo_concurrency: + lock_path: /var/lock logging: loggers: keys: diff --git a/zaqar/templates/deployment-api.yaml b/zaqar/templates/deployment-api.yaml index dc012ff1a8..2a901c9fa4 100644 --- a/zaqar/templates/deployment-api.yaml +++ b/zaqar/templates/deployment-api.yaml @@ -97,6 +97,8 @@ spec: volumeMounts: - name: pod-tmp mountPath: /tmp + - name: oslo-lock-path + mountPath: {{ .Values.conf.zaqar.oslo_concurrency.lock_path }} - name: pod-etc-zaqar mountPath: /etc/zaqar - name: zaqar-bin @@ -130,6 +132,8 @@ spec: volumes: - name: pod-tmp emptyDir: {} + - name: oslo-lock-path + emptyDir: {} - name: pod-etc-zaqar emptyDir: {} - name: zaqar-bin diff --git a/zaqar/values.yaml b/zaqar/values.yaml index 33f74e3e57..4de6ab9865 100644 --- a/zaqar/values.yaml +++ b/zaqar/values.yaml @@ -491,6 +491,8 @@ conf: port: 8888 signed_url: secret_key: SOMELONGSECRETKEY + oslo_concurrency: + lock_path: /var/lock logging: loggers: keys: