Ensure consistent lock_path across all services

This patch removes the conditional check
`om_enable_queue_manager` for `oslo_concurrency` as
it was inconsistently applied across services and
is actually unrelated to the queue manager. Simply
said somewhere the conditional was present and somewhere
it wasn't.

While `oslo.concurrency` itself does not
require a specific path, the implementation of the queue
manager expects locks to be placed under
`/var/lib/<service>/tmp`, making it necessary to define
this path explicitly. Therefore, the lock path is set
accordingly across all services, regardless of whether
the queue manager is used.

Additionally, this patch adds missing `lock_path`
configurations where they were absent to ensure uniformity.

Change-Id: I93bbaa61b2d8b5cb0d1a11783086b37a860173b6

ansible/roles/aodh/templates/aodh.conf.j2

@@ -73,7 +73,5 @@ amqp_durable_queues = true
 rabbit_quorum_queue = true
 {% endif %}
 
-{% if om_enable_queue_manager | bool %}
 [oslo_concurrency]
 lock_path = /var/lib/aodh/tmp
-{% endif %}

ansible/roles/barbican/templates/barbican.conf.j2

@@ -104,7 +104,5 @@ enable_proxy_headers_parsing = True
 policy_file = {{ barbican_policy_file }}
 {% endif %}
 
-{% if om_enable_queue_manager | bool %}
 [oslo_concurrency]
 lock_path = /var/lib/barbican/tmp
-{% endif %}

ansible/roles/blazar/templates/blazar.conf.j2

@@ -72,7 +72,5 @@ rabbit_quorum_queue = true
 policy_file = {{ blazar_policy_file }}
 {% endif %}
 
-{% if om_enable_queue_manager | bool %}
 [oslo_concurrency]
 lock_path = /var/lib/blazar/tmp
-{% endif %}

ansible/roles/ceilometer/templates/ceilometer.conf.j2

@@ -58,7 +58,5 @@ backend = oslo_cache.memcache_pool
 enabled = True
 memcache_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
 
-{% if om_enable_queue_manager | bool %}
 [oslo_concurrency]
 lock_path = /var/lib/ceilometer/tmp
-{% endif %}

ansible/roles/cyborg/templates/cyborg.conf.j2

@@ -82,7 +82,5 @@ amqp_durable_queues = true
 rabbit_quorum_queue = true
 {% endif %}
 
-{% if om_enable_queue_manager | bool %}
 [oslo_concurrency]
 lock_path = /var/lib/cyborg/tmp
-{% endif %}

ansible/roles/glance/templates/glance-cache.conf.j2

@@ -14,3 +14,6 @@ admin_tenant_name = {{ default_project_domain_id }}
 {% if glance_backend_file | bool %}
 filesystem_store_datadir = /var/lib/glance/images/
 {% endif %}
+
+[oslo_concurrency]
+lock_path = /var/lib/glance/tmp

ansible/roles/gnocchi/templates/gnocchi.conf.j2

@@ -98,3 +98,6 @@ swift_project_name = {{ swift_admin_tenant_name }}
 [cors]
 allowed_origin = {{ grafana_public_endpoint }}
 {% endif %}
+
+[oslo_concurrency]
+lock_path = /var/lib/gnocchi/tmp

ansible/roles/heat/templates/heat.conf.j2

@@ -107,7 +107,5 @@ connection_string = {{ osprofiler_backend_connection_string }}
 [volumes]
 backups_enabled = {{ enable_cinder_backup | bool }}
 
-{% if om_enable_queue_manager | bool %}
 [oslo_concurrency]
 lock_path = /var/lib/heat/tmp
-{% endif %}

ansible/roles/ironic/templates/ironic-inspector.conf.j2

@@ -97,3 +97,6 @@ backend_url = etcd3+{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ etcd_
 [accelerators]
 known_devices = /etc/ironic-inspector/known_devices.yaml
 {% endif %}
+
+[oslo_concurrency]
+lock_path = /var/lib/ironic/tmp

ansible/roles/ironic/templates/ironic.conf.j2

@@ -219,7 +219,5 @@ enable_proxy_headers_parsing = True
 dhcp_provider = none
 {% endif %}
 
-{% if om_enable_queue_manager | bool %}
 [oslo_concurrency]
 lock_path = /var/lib/ironic/tmp
-{% endif %}

ansible/roles/keystone/templates/keystone.conf.j2

@@ -100,7 +100,5 @@ remote_id_attribute = {{ keystone_remote_id_attribute_oidc }}
 methods = password,token,openid,application_credential
 {% endif %}
 
-{% if om_enable_queue_manager | bool %}
 [oslo_concurrency]
 lock_path = /var/lib/keystone/tmp
-{% endif %}

ansible/roles/kuryr/templates/kuryr.conf.j2

@@ -27,3 +27,6 @@ cafile = {{ openstack_cacert }}
 [oslo_policy]
 policy_file = {{ kuryr_policy_file }}
 {% endif %}
+
+[oslo_concurrency]
+lock_path = /var/lib/kuryr/tmp

ansible/roles/manila/templates/manila-share.conf.j2

@@ -161,3 +161,6 @@ glusterfs_servers = {% for ip in manila_glusterfs_servers %}{% if manila_gluster
 
 {% if manila_glusterfs_ssh_password is defined %}glusterfs_server_password = {{ manila_glusterfs_ssh_password }}{% endif %}
 {% endif %}
+
+[oslo_concurrency]
+lock_path = /var/lib/manila/tmp

ansible/roles/masakari/templates/masakari-monitors.conf.j2

@@ -41,3 +41,6 @@ corosync_multicast_ports = {{ hacluster_corosync_port }}
 pacemaker_node_type = remote
 {% endif %}
 {% endif %}
+
+[oslo_concurrency]
+lock_path = /var/lib/masakari/tmp

ansible/roles/masakari/templates/masakari.conf.j2

@@ -85,7 +85,5 @@ backend_url = etcd3+{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ etcd_
 {% endif %}
 {% endif %}
 
-{% if om_enable_queue_manager | bool %}
 [oslo_concurrency]
 lock_path = /var/lib/masakari/tmp
-{% endif %}

ansible/roles/mistral/templates/mistral.conf.j2

@@ -101,7 +101,5 @@ connection_string = {{ osprofiler_backend_connection_string }}
 [coordination]
 backend_url = {{ redis_connection_string }}
 
-{% if om_enable_queue_manager | bool %}
 [oslo_concurrency]
 lock_path = /var/lib/mistral/tmp
-{% endif %}

ansible/roles/nova-cell/templates/nova.conf.j2

@@ -98,7 +98,6 @@ project_domain_name = {{ default_project_domain_name }}
 endpoint_override = {{ ironic_internal_endpoint }}/v1
 {% endif %}
 
-
 [oslo_concurrency]
 lock_path = /var/lib/nova/tmp
 

ansible/roles/octavia/templates/octavia.conf.j2

@@ -164,7 +164,5 @@ jobboard_backend_port = "{{ redis_port }}"
 jobboard_backend_hosts = {% for host in groups['redis'] %}{{ 'api' | kolla_address(host) | put_address_in_context('url') }}{% if not loop.last %},{% endif %}{% endfor %}
 {% endif %}
 
-{% if om_enable_queue_manager | bool %}
 [oslo_concurrency]
 lock_path = /var/lib/octavia/tmp
-{% endif %}

ansible/roles/tacker/templates/tacker.conf.j2

@@ -89,7 +89,5 @@ policy_file = {{ tacker_policy_file }}
 [glance_store]
 filesystem_store_datadir = /var/lib/tacker/csar_files
 
-{% if om_enable_queue_manager | bool %}
 [oslo_concurrency]
 lock_path = /var/lib/tacker/tmp
-{% endif %}

ansible/roles/trove/templates/trove-guestagent.conf.j2

@@ -24,3 +24,6 @@ amqp_durable_queues = true
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% endif %}
+
+[oslo_concurrency]
+lock_path = /var/lib/trove/tmp

ansible/roles/trove/templates/trove.conf.j2

@@ -100,7 +100,5 @@ connection_string = {{ osprofiler_backend_connection_string }}
 policy_file = {{ trove_policy_file }}
 {% endif %}
 
-{% if om_enable_queue_manager | bool %}
 [oslo_concurrency]
 lock_path = /var/lib/trove/tmp
-{% endif %}

ansible/roles/venus/templates/venus.conf.j2

@@ -34,7 +34,5 @@ memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_addres
 url = {{ opensearch_internal_endpoint }}
 {% endif %}
 
-{% if om_enable_queue_manager | bool %}
 [oslo_concurrency]
 lock_path = /var/lib/venus/tmp
-{% endif %}