Refactor definition of lock path

Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/819300
Depends-On: https://review.opendev.org/c/openstack/ansible-role-systemd_service/+/819298
Change-Id: I6ce09e0e0b83e14fc9386fc4cb49921a21fcabd4

defaults/main.yml

@@ -57,7 +57,9 @@ swift_system_group_name: swift
 swift_system_shell: /bin/bash
 swift_system_comment: swift system user
 swift_system_home_folder: "/var/lib/{{ swift_system_user_name }}"
-
+swift_system_slice_name: swift
+swift_lock_dir: "{{ openstack_lock_dir | default('/run/lock') }}"
+swift_cache_path: /var/cache/swift
 ## Auth token
 swift_delay_auth_decision: true
 

tasks/main.yml

@@ -107,8 +107,8 @@
     systemd_user_name: "{{ swift_system_user_name }}"
     systemd_group_name: "{{ swift_system_group_name }}"
     systemd_tempd_prefix: openstack
-    systemd_slice_name: swift
-    systemd_lock_path: /var/lock/swift
+    systemd_slice_name: "{{ swift_system_slice_name }}"
+    systemd_lock_dir: "{{ swift_lock_dir }}"
     systemd_CPUAccounting: true
     systemd_BlockIOAccounting: true
     systemd_MemoryAccounting: true

tasks/swift_pre_install.yml

@@ -57,7 +57,7 @@
     - { path: "/etc/swift/proxy-server" }
     - { path: "/etc/swift/scripts" }
     - { path: "/etc/swift/ring_build_files" }
-    - { path: "/var/cache/swift" }
+    - { path: "{{ swift_cache_path }}" }
     - { path: "{{ swift_system_home_folder }}" }
     - { path: "/etc/rsync.d", owner: "root", group: "root" }
 

templates/account-server.conf.j2

@@ -36,8 +36,8 @@ use = egg:swift#healthcheck
 
 [filter:recon]
 use = egg:swift#recon
-recon_cache_path = /var/cache/swift
-recon_lock_path = /var/lock
+recon_cache_path = {{ swift_cache_path }}
+recon_lock_path = {{ swift_lock_dir }}
 
 {% if not swift_dedicated_replication %}
 [account-replicator]

templates/container-server.conf.j2

@@ -37,8 +37,8 @@ use = egg:swift#healthcheck
 
 [filter:recon]
 use = egg:swift#recon
-recon_cache_path = /var/cache/swift
-recon_lock_path = /var/lock
+recon_cache_path = {{ swift_cache_path }}
+recon_lock_path = {{ swift_lock_dir }}
 
 {% if not swift_dedicated_replication %}
 [container-replicator]

templates/object-server.conf.j2

@@ -38,8 +38,8 @@ use = egg:swift#healthcheck
 
 [filter:recon]
 use = egg:swift#recon
-recon_cache_path = /var/cache/swift
-recon_lock_path = /var/lock
+recon_cache_path = {{ swift_cache_path }}
+recon_lock_path = {{ swift_lock_dir }}
 
 {% if not swift_dedicated_replication %}
 [object-replicator]

templates/rsyncd.conf.j2

@@ -10,13 +10,13 @@ address = {{ swift_replication_address }}
 max connections = {{ swift_account_max_rsync_connections }}
 path = {{ swift_vars.mount_point | default(swift.mount_point) }}
 read only = false
-lock file = /var/lock/account.lock
+lock file = {{ swift_lock_dir }}/account.lock
 
 [container]
 max connections = {{ swift_container_max_rsync_connections }}
 path = {{ swift_vars.mount_point | default(swift.mount_point) }}
 read only = false
-lock file = /var/lock/container.lock
+lock file = {{ swift_lock_dir }}/container.lock
 
 {% if swift_rsync_module_per_drive %}
 {### Set up per drive rsync modules #}
@@ -45,7 +45,7 @@ lock file = /var/lock/container.lock
 max connections = {{ swift_object_max_rsync_connections }}
 path = {{ swift_vars.mount_point | default(swift.mount_point) }}
 read only = false
-lock file = /var/lock/object_{{ drive.name }}.lock
+lock file = {{ swift_lock_dir }}/object_{{ drive.name }}.lock
 
 {%         endif %}
 {%         set devAdded = True %}
@@ -57,7 +57,7 @@ lock file = /var/lock/object_{{ drive.name }}.lock
 max connections = {{ swift_object_max_rsync_connections }}
 path = {{ swift_vars.mount_point | default(swift.mount_point) }}
 read only = false
-lock file = /var/lock/object.lock
+lock file = {{ swift_lock_dir }}/object.lock
 
 {% endif %}
 &include /etc/rsync.d