Skip to content

Commit 645bfa0

Browse files
committed
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>
1 parent 74bd196 commit 645bfa0

119 files changed

Lines changed: 447 additions & 27 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

aodh/templates/deployment-api.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ spec:
8282
volumeMounts:
8383
- name: pod-tmp
8484
mountPath: /tmp
85+
- name: oslo-lock-path
86+
mountPath: {{ .Values.conf.aodh.oslo_concurrency.lock_path }}
8587
- name: wsgi-aodh
8688
mountPath: /var/www/cgi-bin/aodh
8789
- name: pod-etc-aodh
@@ -116,6 +118,8 @@ spec:
116118
volumes:
117119
- name: pod-tmp
118120
emptyDir: {}
121+
- name: oslo-lock-path
122+
emptyDir: {}
119123
- name: wsgi-aodh
120124
emptyDir: {}
121125
- name: pod-etc-aodh

aodh/templates/deployment-evaluator.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ spec:
7575
volumeMounts:
7676
- name: pod-tmp
7777
mountPath: /tmp
78+
- name: oslo-lock-path
79+
mountPath: {{ .Values.conf.aodh.oslo_concurrency.lock_path }}
7880
- name: pod-etc-aodh
7981
mountPath: /etc/aodh
8082
- name: aodh-etc
@@ -99,6 +101,8 @@ spec:
99101
volumes:
100102
- name: pod-tmp
101103
emptyDir: {}
104+
- name: oslo-lock-path
105+
emptyDir: {}
102106
- name: pod-etc-aodh
103107
emptyDir: {}
104108
- name: aodh-etc

aodh/templates/deployment-listener.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ spec:
7575
volumeMounts:
7676
- name: pod-tmp
7777
mountPath: /tmp
78+
- name: oslo-lock-path
79+
mountPath: {{ .Values.conf.aodh.oslo_concurrency.lock_path }}
7880
- name: pod-etc-aodh
7981
mountPath: /etc/aodh
8082
- name: aodh-etc
@@ -99,6 +101,8 @@ spec:
99101
volumes:
100102
- name: pod-tmp
101103
emptyDir: {}
104+
- name: oslo-lock-path
105+
emptyDir: {}
102106
- name: pod-etc-aodh
103107
emptyDir: {}
104108
- name: aodh-etc

aodh/templates/deployment-notifier.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ spec:
7575
volumeMounts:
7676
- name: pod-tmp
7777
mountPath: /tmp
78+
- name: oslo-lock-path
79+
mountPath: {{ .Values.conf.aodh.oslo_concurrency.lock_path }}
7880
- name: pod-etc-aodh
7981
mountPath: /etc/aodh
8082
- name: aodh-etc
@@ -99,6 +101,8 @@ spec:
99101
volumes:
100102
- name: pod-tmp
101103
emptyDir: {}
104+
- name: oslo-lock-path
105+
emptyDir: {}
102106
- name: pod-etc-aodh
103107
emptyDir: {}
104108
- name: aodh-etc

aodh/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,8 @@ conf:
459459
enable_proxy_headers_parsing: true
460460
oslo_policy:
461461
policy_file: /etc/aodh/policy.yaml
462+
oslo_concurrency:
463+
lock_path: /var/lock
462464
database:
463465
alarm_history_time_to_live: 86400
464466
max_retries: -1

barbican/templates/deployment-api.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ spec:
9494
volumeMounts:
9595
- name: pod-tmp
9696
mountPath: /tmp
97+
- name: oslo-lock-path
98+
mountPath: {{ .Values.conf.barbican.oslo_concurrency.lock_path }}
9799
- name: etcbarbican
98100
mountPath: /etc/barbican
99101
- name: barbican-etc
@@ -134,6 +136,8 @@ spec:
134136
volumes:
135137
- name: pod-tmp
136138
emptyDir: {}
139+
- name: oslo-lock-path
140+
emptyDir: {}
137141
- name: etcbarbican
138142
emptyDir: {}
139143
- name: barbican-etc

barbican/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,8 @@ conf:
413413
bind_port: null
414414
oslo_policy:
415415
policy_file: /etc/barbican/policy.yaml
416+
oslo_concurrency:
417+
lock_path: /var/lock
416418
# When using the simple_crypto_plugin, a kek must be provided as:
417419
# .conf.barbican.simple_crypto_plugin.kek
418420
# If no kek is provided, barbican will use a well-known default.

blazar/templates/deployment-api.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ spec:
9797
volumeMounts:
9898
- name: pod-tmp
9999
mountPath: /tmp
100+
- name: oslo-lock-path
101+
mountPath: {{ .Values.conf.blazar.oslo_concurrency.lock_path }}
100102
- name: pod-etc-blazar
101103
mountPath: /etc/blazar
102104
- name: blazar-bin
@@ -131,6 +133,8 @@ spec:
131133
volumes:
132134
- name: pod-tmp
133135
emptyDir: {}
136+
- name: oslo-lock-path
137+
emptyDir: {}
134138
- name: pod-etc-blazar
135139
emptyDir: {}
136140
- name: blazar-bin

blazar/templates/deployment-manager.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ spec:
6868
volumeMounts:
6969
- name: pod-tmp
7070
mountPath: /tmp
71+
- name: oslo-lock-path
72+
mountPath: {{ .Values.conf.blazar.oslo_concurrency.lock_path }}
7173
- name: pod-etc-blazar
7274
mountPath: /etc/blazar
7375
- name: blazar-bin
@@ -94,6 +96,8 @@ spec:
9496
volumes:
9597
- name: pod-tmp
9698
emptyDir: {}
99+
- name: oslo-lock-path
100+
emptyDir: {}
97101
- name: pod-etc-blazar
98102
emptyDir: {}
99103
- name: blazar-bin

blazar/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -623,6 +623,8 @@ conf:
623623
driver: messagingv2
624624
oslo_messaging_rabbit:
625625
rabbit_ha_queues: true
626+
oslo_concurrency:
627+
lock_path: /var/lock
626628
manager:
627629
plugins: physical.host.plugin,virtual.instance.plugin,flavor.instance.plugin,virtual.floatingip.plugin
628630
enforcement:

0 commit comments

Comments
 (0)