From dc5845335d73d64c0a32a0b11a263b027ed1f300 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Fri, 29 Mar 2024 12:03:36 +0100 Subject: [PATCH] Define lock directory for oslo_concurrency With [1] it become required to define lock directory for oslo_concurrency which was missing previously. [1] https://review.opendev.org/c/openstack/os-brick/+/814139 Change-Id: Ibe3eb5d50f8e0904d73b93713dda2be0a6b38df7 --- tasks/glance_install.yml | 2 +- templates/glance-api.conf.j2 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tasks/glance_install.yml b/tasks/glance_install.yml index a6448f9d..542194a4 100644 --- a/tasks/glance_install.yml +++ b/tasks/glance_install.yml @@ -150,7 +150,7 @@ systemd_group_name: "{{ glance_system_group_name }}" systemd_tempd_prefix: openstack systemd_slice_name: glance - systemd_lock_path: /var/lock/glance + systemd_lock_dir: /run/lock systemd_service_cpu_accounting: true systemd_service_block_io_accounting: true systemd_service_memory_accounting: true diff --git a/templates/glance-api.conf.j2 b/templates/glance-api.conf.j2 index 52f8b267..dced6875 100644 --- a/templates/glance-api.conf.j2 +++ b/templates/glance-api.conf.j2 @@ -144,6 +144,9 @@ enabled = {{ glance_profiler_enabled }} enable_proxy_headers_parsing = True {% endif %} +[oslo_concurrency] +lock_path = {{ glance_use_uwsgi | ternary('/run/lock/' ~ glance_services['glance-api']['service_name'] ~ '/uwsgi', '/run/lock/glance') }} + {% if glance_cors_allowed_origin is not none %} [cors] allow_headers = origin,content-md5,x-image-meta-checksum,x-storage-token,accept-encoding,x-auth-token,x-identity-status,x-roles,x-service-catalog,x-user-id,x-tenant-id,x-openstack-request-id